summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1a1fa68a7b -s ours ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devXin Li
am: 8a5061e6fb -s ours am skip reason: Merged-In I13a88a6a0a569c90a10e2d456b0b97ad5ddd3d71 with SHA-1 503af3a70d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/17544791 Change-Id: I1e8d8402ae5ba1e7dd4e3e6fad0beba1afd13857 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: 1a1fa68a7b -s oursXin Li
am skip reason: Merged-In I13a88a6a0a569c90a10e2d456b0b97ad5ddd3d71 with SHA-1 503af3a70d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/17544791 Change-Id: I58945344f42c6cac2be185640116b64589a89b08 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: I13a88a6a0a569c90a10e2d456b0b97ad5ddd3d71 Change-Id: I0e4505d9cfb5efc30a1a8d36ef072debca0e10f3
2022-03-28[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
eb5d4bc377 -s ours am: 4c83f7d1ef -s ours am: 503af3a70d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2045921 Change-Id: Id3511a426380eab732520723a3eaac51c5bb4c0b 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
79cb6d1610 -s ours am: a626531198 -s ours am: 6c1a26bd3c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2045921 Change-Id: I848e5cca35c2b3105f17558ae76086bac7633fe4 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
eb5d4bc377 -s ours am: 4c83f7d1ef -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2045921 Change-Id: I13a88a6a0a569c90a10e2d456b0b97ad5ddd3d71 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
79cb6d1610 -s ours am: a626531198 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2045921 Change-Id: I4e573fe53a8f5d40810a6578f5edfcabcc2b1d14 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
6ba61debfa -s ours am: 7e5f5d425e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/17422543 Change-Id: I12ae64aef09f0ad829078d2ea368616eb20c9c96 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
eb5d4bc377 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2045921 Change-Id: I2ce0b882e495a8cab540ea7f6315df6b5cf7834c 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
79cb6d1610 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2045921 Change-Id: Iad06a1ab6630f03be3b6fc3ecde09cb7e6609c07 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
6ba61debfa -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/17422543 Change-Id: I0a9aaafdf09671b9e6d9a69ecabd4ce79f83a7d4 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: I02964c355d6dd60001815aa92ada8e717bb5fb82
2022-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I691e8be6b275e9f2073b7025524117e1de547636
2022-03-09[automerger skipped] Merge "Merge Android 12L" am: 329e708f5b -s ours am: ↵Xin Li
8ca3108d2d -s ours am: 1e92b940ce -s ours am skip reason: Merged-In I5d2c0a01c7f563975c14bb9a14032c4e37063378 with SHA-1 69a7e2e2c3 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2013425 Change-Id: I1c447583ca9b47dca1badbd142d8e298b662f541
2022-03-09[automerger skipped] Merge Android 12L am: 291518e335 -s ours am: b3a9cd0166 ↵Xin Li
-s ours am: 3d60404028 -s ours am skip reason: Merged-In I5d2c0a01c7f563975c14bb9a14032c4e37063378 with SHA-1 69a7e2e2c3 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2013425 Change-Id: I5e2bc3c0c8add949d0e0e7da535c70934afb6e13
2022-03-08[automerger skipped] Merge "Merge Android 12L" am: 329e708f5b -s ours am: ↵Xin Li
8ca3108d2d -s ours am skip reason: Merged-In I5d2c0a01c7f563975c14bb9a14032c4e37063378 with SHA-1 69a7e2e2c3 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2013425 Change-Id: Icdd998f86d8239bbe2c9ddfb831e0d414d1564bf
2022-03-08[automerger skipped] Merge Android 12L am: 291518e335 -s ours am: b3a9cd0166 ↵Xin Li
-s ours am skip reason: Merged-In I5d2c0a01c7f563975c14bb9a14032c4e37063378 with SHA-1 69a7e2e2c3 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2013425 Change-Id: I1d084d5f52af590b6525f288f3269ef15103a417
2022-03-08[automerger skipped] Merge "Merge Android 12L" am: 329e708f5b -s oursXin Li
am skip reason: Merged-In I5d2c0a01c7f563975c14bb9a14032c4e37063378 with SHA-1 69a7e2e2c3 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2013425 Change-Id: Ica2fc113e3aa8c36961cb67faaac67621356f68d
2022-03-08[automerger skipped] Merge Android 12L am: 291518e335 -s oursXin Li
am skip reason: Merged-In I5d2c0a01c7f563975c14bb9a14032c4e37063378 with SHA-1 69a7e2e2c3 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2013425 Change-Id: I2154eb8342e0392f1007d0407499c984796af242
2022-03-08Merge "Merge Android 12L"Xin Li
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: I5d2c0a01c7f563975c14bb9a14032c4e37063378 Change-Id: I7f050ddaef530ea5690c2301a34a5d7548c1207f
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
69a7e2e2c3 -s ours am: 7be1056456 -s ours am skip reason: Merged-In I610ba6eb7fc297d6c21ebbf9829eaca5483d76f4 with SHA-1 174b0427a0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16845383 Change-Id: I47ecdc1918b32d9ede233179f2a3b22bf2266b3b
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
69a7e2e2c3 -s ours am skip reason: Merged-In I610ba6eb7fc297d6c21ebbf9829eaca5483d76f4 with SHA-1 174b0427a0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16845383 Change-Id: Id8414552d39571a4aa783c3d17235b6f08a9eb72
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654Xin Li
Bug: 214455710 Merged-In: I610ba6eb7fc297d6c21ebbf9829eaca5483d76f4 Change-Id: I5d2c0a01c7f563975c14bb9a14032c4e37063378
2022-01-11[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
2d4e391468 -s ours am: 20bac88c15 -s ours am: 48c3b44d49 -s ours am: 29bf578f1e -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/1943806 Change-Id: Id08d4c23550efd3261c68da9febe5852e6715a78
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f9b9606a5c -s ours am: 32901b6239 -s ours am: dd6b6b0506 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16590850 Change-Id: I9bf0253dfc12778757a8a5759b5682ff200e7c28
2022-01-11[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
2d4e391468 -s ours am: 20bac88c15 -s ours am: 48c3b44d49 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/1943806 Change-Id: Iffe1b50487d90fc066e23d1465d49382b65f8d3a
2022-01-11[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
2d4e391468 -s ours am: 20bac88c15 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/1943806 Change-Id: I8567b3667bea75b7cc7ce0ab0c784e01688e1872
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f9b9606a5c -s ours am: 32901b6239 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16590850 Change-Id: I24eb8adebea024e9b2d98ef8027ad0d0953bba6b
2022-01-11[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
2d4e391468 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/1943806 Change-Id: Icb44912fe686998e10b0ccd9868e043381dd6e93
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
f9b9606a5c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16590850 Change-Id: Id57261fb56a42b6aa70318d07e0480e4508d7402
2022-01-11Merge "Import translations. DO NOT MERGE ANYWHERE"android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
2022-01-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I610ba6eb7fc297d6c21ebbf9829eaca5483d76f4
2022-01-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7cb6f5bf8e755422ae63dd1de2dbe92f3ce5f7f7
2021-11-16Merge "Import translations. DO NOT MERGE ANYWHERE"TreeHugger Robot
2021-11-15Merge changes from topic "presubmit-am-c30953f65a604e94bbd452f23524405d" ↵TreeHugger Robot
into sc-qpr1-dev am: f321ce1160 am: baa79c388d am: 371b3f1adb Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457 Change-Id: I4ae6118400e1ea8cfbe87261bbec43f401c2b154
2021-11-15[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 94785aa7db am: d72f50c3e6 -s ours am: 5d14b3c021 -s ours am: f2d97d3fd5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457 Change-Id: Iace3cbfe57ace7d129c3cf0b87dae4f22271dbf3
2021-11-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
11a8bf981f -s ours am: b1861ae491 -s ours am: f95ba3f905 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231758 Change-Id: I87a588a874cc23478119d9f299a1730bfe83a944
2021-11-15Merge changes from topic "presubmit-am-c30953f65a604e94bbd452f23524405d" ↵TreeHugger Robot
into sc-qpr1-dev am: f321ce1160 am: 2f35833682 am: a4e1d58404 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457 Change-Id: I1e453d114f10941a25f2b384f61607e412f01ab1
2021-11-15[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 94785aa7db am: d72f50c3e6 -s ours am: 9dd1e5ba9f -s ours am: de0b9e5cfe -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457 Change-Id: I023bd463da7f6cbde5c63e4810bc1e2b246b4f8e
2021-11-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
11a8bf981f -s ours am: 739b7eadaa -s ours am: 574f45369b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231758 Change-Id: I1fdda14eec5575da6006461dc9a8b2cc84a900de
2021-11-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
686522c81b -s ours am: 00c589122a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231761 Change-Id: I1b343629c7ceb28b5972710eb6a73aba4afec775
2021-11-15Merge changes from topic "presubmit-am-c30953f65a604e94bbd452f23524405d" ↵TreeHugger Robot
into sc-qpr1-dev am: f321ce1160 am: baa79c388d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457 Change-Id: Ie67708a6c193baf88379af8dc5839a50ac23f932
2021-11-15[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 94785aa7db am: d72f50c3e6 -s ours am: 5d14b3c021 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457 Change-Id: I66f80d9cbb1e89bb7609b464a5b7da2a8e8df126
2021-11-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
11a8bf981f -s ours am: b1861ae491 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231758 Change-Id: Ib0b2b56b3b25bab5fc9b732b4bebd8258c885942
2021-11-15Merge changes from topic "presubmit-am-c30953f65a604e94bbd452f23524405d" ↵TreeHugger Robot
into sc-qpr1-dev am: f321ce1160 am: 2f35833682 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457 Change-Id: I53016d9865e65cf1d2636abdea73bb2643957220
2021-11-15[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 94785aa7db am: d72f50c3e6 -s ours am: 9dd1e5ba9f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457 Change-Id: I9d230e0b0221e875d2219d6004727ffbf89dcd8c
2021-11-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
11a8bf981f -s ours am: 739b7eadaa -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231758 Change-Id: I0e5cb4fd701659ea85a695da9f159994ed737b25
2021-11-15Merge changes from topic "presubmit-am-c30953f65a604e94bbd452f23524405d" ↵TreeHugger Robot
into sc-qpr1-dev am: f321ce1160 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/16231457 Change-Id: I26297f93bfaffc24bb1353b6902fd0bc9a10d274
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 15:54:01 +0000