summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-09-28Snap for 9115816 from 6d54dc96eeaf1b08fa8d2e956428b79ec8de2552 to tm-d4-releaseandroid-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseAndroid Build Coastguard Worker
Change-Id: I851d24bffa639a5774ddc8c839c552f944bb244f
2022-09-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d394e94c41 -s ours am: 1d33ab1307 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/20037827 Change-Id: Ifaaeb9e22ab97499dcdd753ad82c0ea589e804ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d394e94c41 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/20037827 Change-Id: I03e97ba5f6eefcf67cef455d90140e12e31622be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-25Snap for 9103983 from 428059bb73cd6c644b1879d0cfbc48206f31c718 to tm-d4-releaseAndroid Build Coastguard Worker
Change-Id: Ida70c9def5439a7b4380aeea4f6fc7e1dd35413d
2022-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0b79af7142 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/20037202 Change-Id: I96d21fc37ec2bb6cd8beb4a367d1313a323a225e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I94bb910acdfaf0ae066356b8c4bce6ad4b42a8a7
2022-09-23Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I124f389763322f5fd124ab40737f435be2eb5bd5
2022-09-22Snap for 9095712 from 3cd89b0b2494ade8a822e89d12d6d0a84eb1004b to tm-d4-releaseAndroid Build Coastguard Worker
Change-Id: I86f92f88a0473e2786f89a488c84981e6de462fd
2022-09-22[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
tm-d1-dev am: a286f1235c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/19994957 Change-Id: Iee26d6ca47be8fcebeba76d979365fa3bcb2e885 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
853c13192d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/19994957 Change-Id: I6f88546a4270f7b903262dcb044f5a1b2b06d77f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-devTreeHugger Robot
2022-09-22Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-devBill Yi
2022-09-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2aa4e1c33f8e0e8bad236921843131414eacc747
2022-09-21Snap for 9088299 from 4565bfd03a02bb9e39c174158f57ff57a17fd61d to tm-d4-releaseAndroid Build Coastguard Worker
Change-Id: Ieb44b79787161af0c3e25213eaa7f259ac602aa8
2022-09-21[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f87abda823 -s ours am: 618c6978b2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/19995089 Change-Id: I6ea618dbea5c2aa745c1e33e63f9c79473032738 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f87abda823 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/19995089 Change-Id: I142913918604427164619231d5194c7f78dab38c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-19Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I75bf0a7a73f0368e79c036919cb68c04fef8b546
2022-09-19Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I82b73866e07de02dd6f8e1fe31ee4b11adff1b85
2022-09-19Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I4ceb8f602eaeea7aa685f6fd080077328044324d
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f4aa266d89 -s ours ↵Xin Li
am: ceeb4cfdfe -s ours am: 186417612e -s ours am: fc31a20846 -s ours am skip reason: Merged-In Id3aa2d100d8a176149212d31b6b2c23fe5f2e904 with SHA-1 b5b9e810bf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/17545206 Change-Id: I008923263f3662fa2e3465bea692acca0f20572f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f4aa266d89 -s ours ↵Xin Li
am: ceeb4cfdfe -s ours am: 186417612e -s ours am skip reason: Merged-In Id3aa2d100d8a176149212d31b6b2c23fe5f2e904 with SHA-1 b5b9e810bf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/17545206 Change-Id: Iefcc9370f46ab88a325665c0603a98338dd07771 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f4aa266d89 -s ours ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devXin Li
am: ceeb4cfdfe -s ours am skip reason: Merged-In Id3aa2d100d8a176149212d31b6b2c23fe5f2e904 with SHA-1 b5b9e810bf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/17545206 Change-Id: Ibf48f84771e5e25492534114ce92b6594777c084 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: f4aa266d89 -s oursXin Li
am skip reason: Merged-In Id3aa2d100d8a176149212d31b6b2c23fe5f2e904 with SHA-1 b5b9e810bf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/17545206 Change-Id: I8a3e9446b0a082e8b4d7b80c87f43369abf8c580 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge Android 12 QPR3 ab/8391262Xin Li
Bug: 226662282 Merged-In: Id3aa2d100d8a176149212d31b6b2c23fe5f2e904 Change-Id: I7a4ec3808f022be9445b063ce1b81134a75ee28a
2022-03-28[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
30bf637e3a -s ours am: c3cb935060 -s ours am: b5b9e810bf -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2043721 Change-Id: I7ffcc59ad0335e789ae9a5d50455e1d4205cf1cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ea1064e182 -s ours am: 7980eea85a -s ours am: a6baf1b811 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2043721 Change-Id: I3ad234fe8a276b828b63cd8311b6fa418ca34633 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
58d03a4378 -s ours am: 7179c2dfd2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/17421800 Change-Id: I95a0bf158f91340bde396fc774733b6aa1b0e303 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
30bf637e3a -s ours am: c3cb935060 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2043721 Change-Id: Id3aa2d100d8a176149212d31b6b2c23fe5f2e904 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ea1064e182 -s ours am: 7980eea85a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2043721 Change-Id: I2a80fda1d6ae5913ab20e020facad8f76c199e14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
58d03a4378 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/17421800 Change-Id: Ic9172a0901b2085805bb03813a77603848a7ad33 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
30bf637e3a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2043721 Change-Id: I279590211419cf6b432e3b65284ca7e0c03adb58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ea1064e182 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2043721 Change-Id: I1cd5f9e32d04818a13e37aa9968791349c8f4c2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28Merge "Import translations. DO NOT MERGE ANYWHERE"Treehugger Robot
2022-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: If3991b1fd5ea2ded5c24ea5f085d4e9e93748003
2022-03-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iace28a4907bc03d276219cbb744c45293c779ec2
2022-03-18[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 3499302f71 am: bcab5b331e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/17223531 Change-Id: Ie678b8d8ac9cd062651d815d787be24f80377c1a
2022-03-18Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-devTreeHugger Robot
2022-03-16[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3499302f71Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/17223531 Change-Id: I0ebd4518cff0ce0302397f0cd5ec06f85890095f
2022-03-16Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id07b01ac0f4afe8694f086c110e3219e4c5bb7d0
2022-03-16Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: If184925b7ba040e8f416e1fbefa4756713f623ab
2022-03-16[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 426c1ebe13Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/17223527 Change-Id: I536d30e9bd4d0287c4aefd188a521b0eb60f3080
2022-03-16Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I991f16c04e29bf55bcffc9b2a27de21ed6ce6763
2022-03-09[automerger skipped] Merge "Merge Android 12L" am: ef9ae5ced4 -s ours am: ↵Xin Li
b25c80bffd -s ours am: fdf193b63a -s ours am skip reason: Merged-In I9ac945126d0372db32986502b8874f1462c663ee with SHA-1 6b3ececa9e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2012828 Change-Id: I0af5c9a9529b3102d134cd9b94e7056bd3c60193
2022-03-09[automerger skipped] Merge Android 12L am: c57b6bc28f -s ours am: ccbb690905 ↵Xin Li
-s ours am: 093c80433b -s ours am skip reason: Merged-In I9ac945126d0372db32986502b8874f1462c663ee with SHA-1 6b3ececa9e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2012828 Change-Id: I0c6d1cc45a82a0c92868122fdf87c2782f2d9dbc
2022-03-08[automerger skipped] Merge "Merge Android 12L" am: ef9ae5ced4 -s ours am: ↵Xin Li
b25c80bffd -s ours am skip reason: Merged-In I9ac945126d0372db32986502b8874f1462c663ee with SHA-1 6b3ececa9e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2012828 Change-Id: I8b1d6d767c182ee2ee4fd81da867423ca57143aa
2022-03-08[automerger skipped] Merge Android 12L am: c57b6bc28f -s ours am: ccbb690905 ↵Xin Li
-s ours am skip reason: Merged-In I9ac945126d0372db32986502b8874f1462c663ee with SHA-1 6b3ececa9e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2012828 Change-Id: I9e351e821e6ac4d611e1a44b5e52a0cecacdc975
2022-03-08[automerger skipped] Merge "Merge Android 12L" am: ef9ae5ced4 -s oursXin Li
am skip reason: Merged-In I9ac945126d0372db32986502b8874f1462c663ee with SHA-1 6b3ececa9e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2012828 Change-Id: Ic26c604581fbb00e0ce813c174c1dde8a5ae72db
2022-03-08[automerger skipped] Merge Android 12L am: c57b6bc28f -s oursXin Li
am skip reason: Merged-In I9ac945126d0372db32986502b8874f1462c663ee with SHA-1 6b3ececa9e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2012828 Change-Id: I55f0dd36bf435d75bc5afc434a4d1fb1773d41da
2022-03-08Merge "Merge Android 12L"Xin Li
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: I9ac945126d0372db32986502b8874f1462c663ee Change-Id: I928453e9ab9925336defcf4baad3e308fb95731d