summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-10Snap for 9157512 from eeda86b30bdda714a63937799c683b4c0ac3624a to ↵aml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I84e504da7856a17969219f03c1f8724e22824873
2022-08-25Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ied8464ab868284e1b5811be4933e48e1baf3db96
2022-07-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I76e1d75ed2fb3392ad76789bd8d26b36bd673576
2022-05-17Snap for 8603585 from f1a55be0dde1c98a0583397d01f0474a560c731f to ↵Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I2897e0d7147ee78494b26858caccabd93a655376
2022-05-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
248e5f942b -s ours am: 79766d67e5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/18091743 Change-Id: I771b98e8160849a7ff70ef8f90c6cf2f096898b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devBill Yi
248e5f942b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/18091743 Change-Id: Icac34d902b780014fef71a1efe93d2059a8f03de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
90e8ced973 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/18091744 Change-Id: I32905a13561ced1f4ce661044797f39ed78b6f3f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ice88a0f908667f25ff173d13cd2bfd1da3acc021
2022-04-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I8316319fb75ab1450fe0142e84c59779bf14d0d5
2022-04-28Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodBill Yi
2022-04-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3f689958a2 -s ours am: 98a43e2e56 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17936075 Change-Id: I805fd37d33aaf26e221eee0bacdb8bc4ea2071f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3f689958a2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17936075 Change-Id: I17abfd87e24edceadc192cad21471f7c2d335cf1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-24Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I80311e93df237f4ea8a1493c2bbe8288292f34ed
2022-04-24Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: If8afa18266cd037aea21e25d33c4554a3b7c0ca1
2022-04-19[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 29e7b349ed am: 1ef7ba2a95 -s ours am: 894e1c9930 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17795014 Change-Id: I566888babc8c494388801ff73c572e10cf2ba3e3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge changes from topic "presubmit-am-603b5f68c48f47bbbd458305f0cba030" ↵Bill Yi
into tm-dev am: d334885508 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17796332 Change-Id: Icdb1b2e9edce22ffa6191a9c00ec289c4536e3b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: d6095e85f1 am: 70d7145b49 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17796332 Change-Id: I78774adc560545dde57ca4ffdea3a2e19d528dcb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7599101fbf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17785164 Change-Id: I477c5d80a1481be53b0ac43ca6374c72ee96f435 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: 29e7b349ed am: 1ef7ba2a95 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17795014 Change-Id: I31744d05d666081a3cbb3301b9cbd04aa7b4cded Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19Merge changes from topic "presubmit-am-603b5f68c48f47bbbd458305f0cba030" ↵Bill Yi
into tm-dev * changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6095e85f1 Import translations. DO NOT MERGE ANYWHERE
2022-04-17[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 29e7b349edBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17795014 Change-Id: I1dedfae3c3f82c52d61bdc3eb1b816b4154d8103
2022-04-17Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I0559950e2f9adf46326ca2c89a83b5e2147aaf67
2022-04-17[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6095e85f1Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17796332 Change-Id: Ia4f9ab8abd05def48c9f7abbf25cb076c40197fb
2022-04-17Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ib3ead11fe4866bc80a6d475441663f121bea46fc
2022-04-17Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I73225a1c998dfcd1d2a826f0ad818657b9233d59
2022-04-17Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ied89c363d7ae4fb9d03764dcc002f0f5f8ec343e
2022-04-03[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: af017bd4e4 -s ours ↵Xin Li
am: e2a73e0108 -s ours am: 8c9eeaaa9d -s ours am skip reason: Merged-In Ia6f0723980fad80eb24e6de349d5fed8b04176bc with SHA-1 1899e4e30d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17545263 Change-Id: I4dd8904311eebfd6d303000047be054033e99f04 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: af017bd4e4 -s ours ↵Xin Li
am: e2a73e0108 -s ours am skip reason: Merged-In Ia6f0723980fad80eb24e6de349d5fed8b04176bc with SHA-1 1899e4e30d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17545263 Change-Id: I95900a83e41caf2df729cfbfb3b8feeee97b8f5b 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: af017bd4e4 -s oursXin Li
am skip reason: Merged-In Ia6f0723980fad80eb24e6de349d5fed8b04176bc with SHA-1 1899e4e30d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17545263 Change-Id: I54bfd9472838bf32409c70c9e377ec904f4c93f5 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: Ia6f0723980fad80eb24e6de349d5fed8b04176bc Change-Id: I41e08ba8fa28dfe2853c2e8da3d3a93da12ddaab
2022-03-28[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
ae9168510e -s ours am: 04d4ddabcc -s ours am: 1899e4e30d -s ours am: d833a87111 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2043311 Change-Id: Ic502c313ee91a5f61da4d3ee31e6e0ad4aa7c84e 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
825e9087d5 -s ours am: 8f6a33b415 -s ours am: d3fe557dd5 -s ours am: 2688dbe23c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2043311 Change-Id: I0b2171070e2fec08dfc7d0bac6aa35d2937886c8 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
bafc88865b -s ours am: 53164d1ece -s ours am: 4c8ce9f3e5 -s ours am: 42386c7509 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2045863 Change-Id: I768abf87a86e1143f9e6bb6d04c641de9ee0ce30 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" into ↵TreeHugger Robot
stage-aosp-master am: 060060fdcf -s ours am: 91e48aa2d2 -s ours am: 32760a99e4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17422283 Change-Id: I3c8df6454a158e8559de91ffef14766bf244642e 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
1ed6d0ffd5 -s ours am: 5f96253186 -s ours am: eb2d0e0bd4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17422283 Change-Id: I42a3f7dcd8ed85ac41be9cf810f3899e12155084 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
57245a3152 -s ours am: 3819761b47 -s ours am: adacf3bd2a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17422284 Change-Id: I90ad358211a85630522abe2240a143a3360306d0 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
ae9168510e -s ours am: 04d4ddabcc -s ours am: 1899e4e30d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2043311 Change-Id: Iaeef26332742a799f755d22d7722d2a5f5f7c911 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
825e9087d5 -s ours am: 8f6a33b415 -s ours am: d3fe557dd5 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2043311 Change-Id: I81c28c883be7449a2e875e4ba907b2efb0aa80fc 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
bafc88865b -s ours am: 53164d1ece -s ours am: 4c8ce9f3e5 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2045863 Change-Id: Ic280ff35d00a45a5fc996fc2c3e839e5951efe92 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" into ↵TreeHugger Robot
stage-aosp-master am: 060060fdcf -s ours am: 91e48aa2d2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17422283 Change-Id: I2997db4b4d57ad03eb408ab3a1b8907d3c92d258 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
1ed6d0ffd5 -s ours am: 5f96253186 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17422283 Change-Id: Ibb2b9fd4d4f73a891e65dfb05523b9b43346ce6d 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
57245a3152 -s ours am: 3819761b47 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17422284 Change-Id: I66588f491a62dde29fc91cff823805d80c2346c9 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
ae9168510e -s ours am: 04d4ddabcc -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2043311 Change-Id: Ia6f0723980fad80eb24e6de349d5fed8b04176bc 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
825e9087d5 -s ours am: 8f6a33b415 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2043311 Change-Id: I00b458d38e231fd903ca7003d3565f59d75e8106 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
bafc88865b -s ours am: 53164d1ece -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2045863 Change-Id: I46bffd7d164441956c048cdfedd80b7e0f14b083 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" into ↵TreeHugger Robot
stage-aosp-master am: 060060fdcf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17422283 Change-Id: I3d304dd974c69991fc471e03cdd4cde8c4c10593 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
1ed6d0ffd5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17422283 Change-Id: Ic447db8db33fc78b609c5cc84369c2b394d884fc 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
57245a3152 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/17422284 Change-Id: I30b15e1bddf7e4cefb3565396a14a01d025b1f97 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
ae9168510e -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2043311 Change-Id: I8181adffcb7d61a574746276688d2d5c3937e252 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
825e9087d5 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2043311 Change-Id: I2d7309e26b3e43e49d34e431583e787988f4f11e 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-06-22 05:57:16 +0000