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: I4cdcd3ebbf1a4db61bbdf0b17639faba0002c7a6 Change-Id: Ibc413780e76c70761e4fb7157ac6cc57809f3732
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I079712e745f19a8f8b5297a036ebb05178a226fe Change-Id: I4cdcd3ebbf1a4db61bbdf0b17639faba0002c7a6
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: d91489808e ↵Xin Li
-s ours am: dbed2ff090 -s ours am: 033a7a00de -s ours am skip reason: Merged-In Ie50e6fc11ce38ad6a0d7058c16e24780153e3d65 with SHA-1 b4230be81c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2864972 Change-Id: Iac1243117d8028e0a41b4f3f9032be953eab3d90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: e55eb3cab3 -s ours am: ↵Xin Li
2d90d14b79 -s ours am: e5f61b3111 -s ours am skip reason: Merged-In Ie50e6fc11ce38ad6a0d7058c16e24780153e3d65 with SHA-1 b4230be81c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2864972 Change-Id: I00ebee603049267af18531937466c9adf5165e31 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: d91489808e ↵Xin Li
-s ours am: dbed2ff090 -s ours am skip reason: Merged-In Ie50e6fc11ce38ad6a0d7058c16e24780153e3d65 with SHA-1 b4230be81c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2864972 Change-Id: Ie43990ff38b13122213c76bbe61346ae6ea606fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: e55eb3cab3 -s ours am: ↵Xin Li
2d90d14b79 -s ours am skip reason: Merged-In Ie50e6fc11ce38ad6a0d7058c16e24780153e3d65 with SHA-1 b4230be81c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2864972 Change-Id: Ia8350169f7d70a476e08022e8bbb53864ad56294 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: d91489808e ↵Xin Li
-s ours am skip reason: Merged-In Ie50e6fc11ce38ad6a0d7058c16e24780153e3d65 with SHA-1 b4230be81c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2864972 Change-Id: Idbb7c35f3e71c8c542d92086fe7c80f078cc5db2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: e55eb3cab3 -s oursXin Li
am skip reason: Merged-In Ie50e6fc11ce38ad6a0d7058c16e24780153e3d65 with SHA-1 b4230be81c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2864972 Change-Id: I9fbc7f95e5ac1d0b58f21ea2f9389fae0be5bbeb 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: Ie50e6fc11ce38ad6a0d7058c16e24780153e3d65 Bug: 315507370 Change-Id: Iee128ab527efa7d9cff6bef19975b52c0ca37f46
2023-12-07[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1c57f14786 -s ours am: 10ac15e638 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/25562383 Change-Id: I272eb3cbe560cc7a21911186e1811a8a5cb58db7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1c57f14786 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/25562383 Change-Id: I05591aeb0b9112da5f99b909679ba4549792a5cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I079712e745f19a8f8b5297a036ebb05178a226fe
2023-12-05Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iface286349114ec6781def93eda309627cb3839e
2023-10-19[automerger skipped] Merge 10952656 am: b4230be81c -s ours am: 4b36941338 -s ↵Xin Li
ours am skip reason: Merged-In I45b68b89af5f9cbc09d9d3809fbf71876cc8f2cf with SHA-1 863d640e58 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/25093283 Change-Id: I9233aa0a8498331678a5b396fe3c473d7bf5995e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19[automerger skipped] Merge 10952656 am: b4230be81c -s oursXin Li
am skip reason: Merged-In I45b68b89af5f9cbc09d9d3809fbf71876cc8f2cf with SHA-1 863d640e58 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/25093283 Change-Id: Id21cbbd09744f8dcdf123da691c9e87736d05701 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: I45b68b89af5f9cbc09d9d3809fbf71876cc8f2cf Change-Id: Ie50e6fc11ce38ad6a0d7058c16e24780153e3d65
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
cc754f6470 -s ours am: dc6edae684 -s ours am: 1dcba3bcfe -s ours am: 863d640e58 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/24612404 Change-Id: I20e1470f3fa58e2accfaa77f8910ae6224fcaf70 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
cc754f6470 -s ours am: dc6edae684 -s ours am: 1dcba3bcfe -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/24612404 Change-Id: I45b68b89af5f9cbc09d9d3809fbf71876cc8f2cf 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
cc754f6470 -s ours am: dc6edae684 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/24612404 Change-Id: I48192d3178633e9b82951310d495d26c84376764 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
cc754f6470 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/24612404 Change-Id: Ib7c79210d6ed0dfafc5bf3527834712c4c144909 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ib60ea1c877ec4d86824c86ba0bb1cc68f79f15e0
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 46501a7e82 -s ours ↵Xin Li
am: 9273d8c4ee -s ours am: c08c158156 -s ours am: 2f768f752e -s ours am skip reason: Merged-In Idbcd02f0a4aa3b2346ab5c52e13c6120c4a94f57 with SHA-1 5471d8a746 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/24182870 Change-Id: I9d12d10a3dcb75e0181d28cff70bc583e39509a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 46501a7e82 -s ours ↵Xin Li
am: 9273d8c4ee -s ours am: c08c158156 -s ours am skip reason: Merged-In Idbcd02f0a4aa3b2346ab5c52e13c6120c4a94f57 with SHA-1 5471d8a746 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/24182870 Change-Id: I40f7c06d3039b7c17c440ad153e899b1c7359128 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 46501a7e82 -s ours ↵Xin Li
am: 9273d8c4ee -s ours am skip reason: Merged-In Idbcd02f0a4aa3b2346ab5c52e13c6120c4a94f57 with SHA-1 5471d8a746 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/24182870 Change-Id: Ib29b4b95c00f4ce775af78ef236fe3527b86b981 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 46501a7e82 -s oursXin Li
am skip reason: Merged-In Idbcd02f0a4aa3b2346ab5c52e13c6120c4a94f57 with SHA-1 5471d8a746 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/24182870 Change-Id: I2f6e530bcf7d7cb1c1b0917832f363506aa999c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: Idbcd02f0a4aa3b2346ab5c52e13c6120c4a94f57 Change-Id: Ia95440d7c153adbb002790fcfe4b72b095a913b3
2023-06-05[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
da9c224646 -s ours am: 66a84f47c7 -s ours am: d337af6730 -s ours am: 5471d8a746 -s ours am: c57ff8b485 -s ours am: 88ac83656f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2614634 Change-Id: Ie20c3426b305030eaacb00128493b1580091f895 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ac8f060c59 -s ours am: a64d609484 -s ours am: d42f3d84e8 -s ours am: b9d5934724 -s ours am: 02de56a491 -s ours am: 9d0004770b -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2614634 Change-Id: I7d86abb740fc816ba1649fee1de2decc24ee75d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
da9c224646 -s ours am: 66a84f47c7 -s ours am: d337af6730 -s ours am: 5471d8a746 -s ours am: c57ff8b485 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2614634 Change-Id: Icc48c644fb5ea47be0609cdbb0e952f409351baa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ac8f060c59 -s ours am: a64d609484 -s ours am: d42f3d84e8 -s ours am: b9d5934724 -s ours am: 02de56a491 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2614634 Change-Id: I089ddec6b4d341f3ed382373cd4e881376d32027 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
da9c224646 -s ours am: 66a84f47c7 -s ours am: d337af6730 -s ours am: 5471d8a746 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2614634 Change-Id: I5c538a35234ac2e297c8dd23f7f107046eafe888 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ac8f060c59 -s ours am: a64d609484 -s ours am: d42f3d84e8 -s ours am: b9d5934724 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2614634 Change-Id: Ie71b8f87f6eac8e2e1c329581a6b962b50d67bfc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
da9c224646 -s ours am: 66a84f47c7 -s ours am: d337af6730 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2614634 Change-Id: Idbcd02f0a4aa3b2346ab5c52e13c6120c4a94f57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ac8f060c59 -s ours am: a64d609484 -s ours am: d42f3d84e8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2614634 Change-Id: I09ed345c0224695e69119cab9f47818ba87acb00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
da9c224646 -s ours am: 66a84f47c7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2614634 Change-Id: I54d9b5b776477a76c3a42a8428d048bdc6405e29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ac8f060c59 -s ours am: a64d609484 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2614634 Change-Id: Ic66648e11f8b4d6747a87e90fb9996e2e4409cba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
da9c224646 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2614634 Change-Id: I3fc396122e720013f238462d427f5a8357e51f2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ac8f060c59 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2614634 Change-Id: I736b4e5349bbb7a221c581d0f7f7b681d767476c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05Merge "Import translations. DO NOT MERGE ANYWHERE"Treehugger Robot
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id4a7b2c2ff7c7d2d20a5367b539682352cc3b197
2023-05-06[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1b537f3a29 -s ours am: fb9ffe30f7 -s ours am: 7cdeae1190 -s ours am: 9a26b31c31 -s ours am: 49d447fd59 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/22974180 Change-Id: I083535fbfd6ecf21806ac6a6ce10f5b39866e473 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1b537f3a29 -s ours am: fb9ffe30f7 -s ours am: 7cdeae1190 -s ours am: 9a26b31c31 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/22974180 Change-Id: Id504c3ab2882b5bb7061273fb232bf49a7f81950 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 1b537f3a29 2p: d814029381 am: c0fce9aa11 -s ours am: 8ab5b39fb0 -s ours am: 144334c134 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/22974180 Change-Id: I593ef000a86c271276b38da0bdabf64c955be4be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1b537f3a29 -s ours am: fb9ffe30f7 -s ours am: 7cdeae1190 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/22974180 Change-Id: I690d97094c4048b0ef3fd36237148b7d0d4ed4c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 1b537f3a29 2p: d814029381 am: c0fce9aa11 -s ours am: 8ab5b39fb0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/22974180 Change-Id: I34b6eb5b0bebff5f129b6ec901527668d3b7655c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1b537f3a29 -s ours am: fb9ffe30f7 -s ours am: 30ca446b5d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/22974180 Change-Id: I3b9c6103b0bac6576889b9968ad97faac43bcd0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 1b537f3a29 2p: d814029381 am: c0fce9aa11 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/22974180 Change-Id: I316bb539ede99f484482b5e251daaaebb135a709 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1b537f3a29 -s ours am: fb9ffe30f7 -s ours am: 5bc85fb9aa -s ours am: 368b7ed55a -s ours am: 5cf797a0f2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/22974180 Change-Id: I65c97e8e133695583bda0198b0af3c2a4a3f86fa 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-07 08:10:37 +0000