summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10447354 from 73795dc1730b7de32b1f9842abeb129cee04390e to ↵aml_res_341510000aml_res_341410010aml_res_341311030aml_res_341110000aml_res_340912000android14-mainline-resolv-releaseAndroid Build Coastguard Worker
mainline-resolv-release Change-Id: If9aea559857bedab2921a89c1d182dcb6768ffc7
2023-03-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7b04882444 -s ours am: 96b0c39823 -s ours am: fc824bf4fd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/21604449 Change-Id: I7733b92c75220f088e8fd241e1c29ea6a3bb4b5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵android14-devBill Yi
7b04882444 -s ours am: 96b0c39823 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/21604449 Change-Id: Iaad4d60096476a2a4c5459a0c2d2cb416c3af958 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7b04882444 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/21604449 Change-Id: I5e1376efe17ab77f69ffd7ef72aedb3e7857fe96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-26Import translations. DO NOT MERGE ANYWHEREandroid-u-beta-1-gplBill Yi
Auto-generated-cl: translation import Change-Id: If079319fcce1e69007ac240c65897cca7b4f3c5c
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
07d415ff37 -s ours am: 22552b23c5 -s ours am skip reason: Merged-In I8c2bdef3e3cfe107b13dade69e33ce48fda5d713 with SHA-1 7a0900bfbf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/20956783 Change-Id: I1e0f12d134ccfde5f11c81397b51af9efb7430bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
07d415ff37 -s ours am skip reason: Merged-In I8c2bdef3e3cfe107b13dade69e33ce48fda5d713 with SHA-1 7a0900bfbf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/20956783 Change-Id: I433cb9a1d045706149e6804ca607025e7dfcc48b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136Xin Li
Bug: 264720040 Merged-In: I8c2bdef3e3cfe107b13dade69e33ce48fda5d713 Change-Id: I4bbe27935e689ecb45772bde28cce9ce6c9d3726
2023-01-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Idee814656108b177ecbd5966c2722098cf45ef7a
2023-01-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7a0900bfbf -s ours am: c35f7256b2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/20842669 Change-Id: I287593ec3903baab7474f632d0512d2092e9400b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7a0900bfbf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/20842669 Change-Id: Ia616af2ee20889cda21c53af69c912ba0bde10f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-29Import translations. DO NOT MERGE ANYWHEREandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseBill Yi
Auto-generated-cl: translation import Change-Id: I8c2bdef3e3cfe107b13dade69e33ce48fda5d713
2022-12-21Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7a544291db2daccf3466eef4fe308d539895163e
2022-12-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
a5dd8c512d -s ours am: 016e631b87 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/20782317 Change-Id: Ic02c69ec31002e8b36995ed17e7fd3a33e7223cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
a5dd8c512d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/20782317 Change-Id: I582c4dc08d57cd1865fed23ec77c70733592e839 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2a1187166a1f55ab725b39bcd6fb8ffb0a991d72
2022-12-12[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: d01f1603a7 -s ours am: 0eda1cfb23 -s ours am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: Ib420ed846be53fdb98a84f8318fef4c968cc3c6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge "Merge Android 13 QPR1" am: 402ce341a6 -s ours ↵Xin Li
am: 9dd8a1857e -s ours am: a93ab4dac0 -s ours am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: I18c601592598853b4832e0bcfbcbf773eb026133 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge "Merge Android 13 QPR1" am: 402ce341a6 -s ours ↵Xin Li
am: aaab12e211 -s ours am: 735bcb550d -s ours am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: I16569cba9cd79b4a1285809e38440b76775825f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 6394470d8b -s ours am: ↵Xin Li
0ddc4bdf80 -s ours am: 7fc0b56fea -s ours am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: I62143761de72f7053e5f098c6fdbc3f76f4d1514 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into ↵Automerger Merge Worker
stage-aosp-master am: d01f1603a7 -s ours am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: I0b85e7568726390ee3471273f0030fcff21bc4ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge "Merge Android 13 QPR1" am: 402ce341a6 -s ours ↵Xin Li
am: 9dd8a1857e -s ours am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: Id80ffbb51bb27b23c3652a4fec5a8ba9a76e6514 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge "Merge Android 13 QPR1" am: 402ce341a6 -s ours ↵Xin Li
am: aaab12e211 -s ours am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: I68dd6c0c78ae7e93c8912e19d4e8cf26775ab48f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 6394470d8b -s ours am: ↵Xin Li
0ddc4bdf80 -s ours am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: I55393e4ccdd1ece4c0f7709ab19a139206797b03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into ↵Automerger Merge Worker
stage-aosp-master * changes: [automerger skipped] Merge "Merge Android 13 QPR1" am: 402ce341a6 -s ours [automerger skipped] Merge Android 13 QPR1 am: 6394470d8b -s ours
2022-12-09[automerger skipped] Merge "Merge Android 13 QPR1" am: 402ce341a6 -s oursXin Li
am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: I034a9fd7a4092de674bea0393f120412c023b7f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 6394470d8b -s oursXin Li
am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: I514544a44af0c5e78fa3687c6ecadec7e70ba31e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge "Merge Android 13 QPR1" am: 402ce341a6 -s oursXin Li
am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: I4f350766a18386cf90b54474793e503951d7d5dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 6394470d8b -s oursXin Li
am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: I6d7b4358be6e31a152caf4c6a271f581afed5c1b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09Merge "Merge Android 13 QPR1"main-16k-with-phonesXin Li
2022-12-09Merge Android 13 QPR1Xin Li
Bug: 261731544 Merged-In: Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 Change-Id: If0a28412720dfde62349e60296b1c62cd71b72ba
2022-12-07[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Bill Yi
275a85857e -s ours am: 459f53c0b0 -s ours am: 72f0b9b183 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2326483 Change-Id: I700fb24570939a219c8140b36befd2743832216b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c9688634ac -s ours am: 1117eb632c -s ours am: a8fa2063a4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2326483 Change-Id: If8264aefe4b19ecbf9bef22d4cd4045be3a02039 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Bill Yi
275a85857e -s ours am: 459f53c0b0 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2326483 Change-Id: I49fb9f94b31d3da71b3f28ded8dffda49740e868 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c9688634ac -s ours am: 1117eb632c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2326483 Change-Id: Id37faf526036411ab3bc0371e1f1e1ccc68294d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Bill Yi
275a85857e -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2326483 Change-Id: I0987288a5e8a8978e9c941ef39e9285efb6fe44d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c9688634ac -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2326483 Change-Id: Ie0dff1fd39abaf38f0ade9a4bb529141241c7704 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-07Merge "Import translations. DO NOT MERGE ANYWHERE"Bill Yi
2022-12-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
360a0a6499 -s ours am: 858402b387 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/20610785 Change-Id: Ib8f6fe839d33953bca08e7e874f5da82443ece23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
360a0a6499 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/20610785 Change-Id: Ibf99a91879ffb79d6fa299f080e34d0bae4497e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08
2022-12-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id953f92bfd63efeb5959b8b4cea2820f1c845abc
2022-11-17Merge "Import translations. DO NOT MERGE ANYWHERE"Bill Yi
2022-11-16[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e3d0cea85e -s ours am: ee450cfaa5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/20493219 Change-Id: I730b6e396b872ea1267c055f2b85e00b5ca09706 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e3d0cea85e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/20493219 Change-Id: I3988ff6ac49cdcef72e30910295e748667fe0240 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-16Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: If3dced6e7d6d8861958389520e648bab4153e146
2022-11-16Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I9741206d50f2967215dbc7e119075a8935585b5a
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ↵Xin Li
7e1a8872d4 -s ours am: 8c7f1d388f -s ours am skip reason: Merged-In I1ed56797000b06e7875627584942d34712a9234f with SHA-1 a46900f26f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/20136640 Change-Id: Ib567ce4001304556348992133cddf497099a8a2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: ↵Xin Li
7e1a8872d4 -s ours am skip reason: Merged-In I1ed56797000b06e7875627584942d34712a9234f with SHA-1 a46900f26f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/20136640 Change-Id: I8f2ec1dafb2aef79aed76b0ef8c5bf460d50be26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06Merge tm-qpr-dev-plus-aosp-without-vendor@9129937Xin Li
Bug: 248070379 Merged-In: I1ed56797000b06e7875627584942d34712a9234f Change-Id: Ieec4712e1009a0fee6d813db28b4ddc63c2389fc
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 13:03:38 +0000