summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-07Merge "Merge Android 14 QPR2 to AOSP main" into mainHEADmastermainXin Li
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: I5c13525b4e96d3ed916189687b98fd49232787ff Change-Id: I7e28e48e9330608e51cb19615e3f3be99867fbba
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I269379e231fc891bc02a7e801b3240a4fc759456 Change-Id: I5c13525b4e96d3ed916189687b98fd49232787ff
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 255f0a2b79 ↵Xin Li
-s ours am: e36d206872 -s ours am: e1b2fbe412 -s ours am skip reason: Merged-In I5259eac6081347d19b0658566ce4c1d73ee1974f with SHA-1 9388fc8f5e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2862949 Change-Id: Ib0ff7d53568044b908e397633317bd80a0891265 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 91b06aa512 -s ours am: ↵Xin Li
ab7b3f6c2b -s ours am: eab8388e49 -s ours am skip reason: Merged-In I5259eac6081347d19b0658566ce4c1d73ee1974f with SHA-1 9388fc8f5e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2862949 Change-Id: If5951c3680c4f901500774237957cc92fa4ca0a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 255f0a2b79 ↵Xin Li
-s ours am: e36d206872 -s ours am skip reason: Merged-In I5259eac6081347d19b0658566ce4c1d73ee1974f with SHA-1 9388fc8f5e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2862949 Change-Id: Ife33234c4136da6c047b2aa3e8e781d300635bd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 91b06aa512 -s ours am: ↵Xin Li
ab7b3f6c2b -s ours am skip reason: Merged-In I5259eac6081347d19b0658566ce4c1d73ee1974f with SHA-1 9388fc8f5e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2862949 Change-Id: I355f25b471f39ba10f30a6ab2a67ea7a0278b61d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 255f0a2b79 ↵Xin Li
-s ours am skip reason: Merged-In I5259eac6081347d19b0658566ce4c1d73ee1974f with SHA-1 9388fc8f5e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2862949 Change-Id: Id3d05809f0a182bbb5898d465baa0261680c4fe8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 91b06aa512 -s oursXin Li
am skip reason: Merged-In I5259eac6081347d19b0658566ce4c1d73ee1974f with SHA-1 9388fc8f5e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2862949 Change-Id: I4f25cbd5f2144e2786266cfc955c62f0e459275f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09Merge "Merge Android 14 QPR1" into mainXin Li
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I5259eac6081347d19b0658566ce4c1d73ee1974f Bug: 315507370 Change-Id: If9f7b9c88be4aa09438c52e94f06a68d51ce4a4b
2023-10-19Merge 10952656 am: 9388fc8f5e am: caa677c0a8Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/25089414 Change-Id: I473a59672cebbc089ca5dba6223017459b09020f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Merge 10952656 am: 9388fc8f5eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/25089414 Change-Id: I8d9165f347fe50795ab8570bcc800e7851f1d987 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: Change-Id: I5259eac6081347d19b0658566ce4c1d73ee1974f
2023-10-03Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
66b8c8e9b8 -s ours am: ddf371d0c4 -s ours am: 5d9a3937c4 -s ours" into udc-qpr-dev-plus-aosp am: 6efb630c29 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: Ie71c5dce7274f3e5922572d402e820ffd7d17ae8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am: ddf371d0c4 -s ours am: 5d9a3937c4 -s ours am: 70b0f9b84b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I330668aeac4b6029f28ecea642b75990eb667735 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
66b8c8e9b8 -s ours am: ddf371d0c4 -s ours" into udc-d1-dev-plus-aosp am: a31703e479 -s ours am: f8232cac01 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I61fe1ad7337be2794c6c996cfbd5b436a5d79e34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am: ddf371d0c4 -s ours am: ebc6844c6c -s ours am: 9a943485b5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I1cb789f29fcd22b858165612531e65c9b4b78d7a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am: b5b1bb353e -s ours am: 13a34f2716 -s ours am: bd22c74a83 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I1be0edebfe914e84d392af2b3a5192576b9bbd25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
66b8c8e9b8 -s ours am: ddf371d0c4 -s ours am: 5d9a3937c4 -s ours" into udc-qpr-dev-plus-aosp
2023-10-03Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
66b8c8e9b8 -s ours am: ddf371d0c4 -s ours" into udc-d1-dev-plus-aosp am: a31703e479 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I53883c4089e75e32906e4611a9f37862d5d22d44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am: ddf371d0c4 -s ours am: ebc6844c6c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I00e7679b1a984e8987e835c06d27bbc3a55e8893 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am: ddf371d0c4 -s ours am: 5d9a3937c4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: Idd9d52839325c9b9e2f0f8ddd7cbbf0bb7a1eaa4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am: b5b1bb353e -s ours am: 13a34f2716 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I93af0140b80e755ed88c1f5f9931169ef865b083 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
66b8c8e9b8 -s ours am: ddf371d0c4 -s ours" into udc-d1-dev-plus-aosp
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am: ddf371d0c4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I3ccafc58c4ba3d33f3528b203cf571e400672c95 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am: b5b1bb353e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I8decf72ae34fc83d1e79f820c7b6956acb50e5f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am: ddf371d0c4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: If044cc087f770145e4c98390e95b87faad2aebb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am: b78119f973 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I60645a75ed15dbd782f5c1b35355e7a63aabb631 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I25bb1ba0f691d6834e8afa1194917eff5c0dc64b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I2438acb7361754db27777a4f7a7f6fd5154c743d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
66b8c8e9b8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24917302 Change-Id: I5079f4f00c2c1ceb390e951fbab025131a868015 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ff0c925f02 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24916793 Change-Id: I2f7d6ad8d81cb5848c1953138f20eef3703185d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-03Merge "Import translations. DO NOT MERGE ANYWHERE" into mainBill Yi
2023-10-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
56bf4b7aaa -s ours am: 8938b8a01c -s ours am: 794c179836 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24916794 Change-Id: Iea6bf3ede97faf6b9cdfc231471b5f6e923b1591 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
56bf4b7aaa -s ours am: 5483afe768 -s ours am: b25e428968 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24916794 Change-Id: I879f48c3d100a81320ae7d02f026b0eb31315f4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
56bf4b7aaa -s ours am: 8938b8a01c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24916794 Change-Id: I5a264ee5f5f36b66d4e5e41167d3a8f947f91ec5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
56bf4b7aaa -s ours am: 5483afe768 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24916794 Change-Id: I258680a3dcfbbaa1ead7eae41d75063f0e703858 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
56bf4b7aaa -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24916794 Change-Id: I1f9541bd51e654a403646edaf33e4e9bc7ced0b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-02[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
56bf4b7aaa -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24916794 Change-Id: I5ff481b9436eb8188219382406a86f269c24b01d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-01Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I269379e231fc891bc02a7e801b3240a4fc759456
2023-10-01Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie20a1503682dc6837226afaa3cd9ff840f388c18
2023-10-01Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: If1a1466f9d5cba3675d14bf8312218ed98b5fb76
2023-10-01Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I657219cd7c4ee06ca5ead2163ead8191bce22e5b
2023-09-30[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ce1500663a -s ours am: febc930f4b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24904973 Change-Id: I306a990a4b1cc9e5a4c2e09aa32c62a04ad9a554 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ce1500663a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24904973 Change-Id: I0655ce76194d197be506ea115b2c6d0c19a0bcdb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ifae5d9e3c34f7cfcafa83f97396a6f146b252c3c
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
a440d83a23 -s ours am: 0496f771f5 -s ours am: 9dd34d808b -s ours am: 806b349af9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24617020 Change-Id: I6fc5ca8f95cffedaddb6f0a0a7af6cc31843551f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
a440d83a23 -s ours am: 0496f771f5 -s ours am: 9dd34d808b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24617020 Change-Id: Ib312886e32e5be8c16fffc7f75cb93b6ad7966c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
a440d83a23 -s ours am: 0496f771f5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/24617020 Change-Id: I5145f55d4bdf2b54d21fd453935fc2ddec865d1a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 20:40:40 +0000