summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-05Snap for 8547970 from 79766d67e50eeddd1f068b5c3f01da02935f9c6b to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseAndroid Build Coastguard Worker
Change-Id: Iebd627867a305e14bc17ac46e7693fdda9681cfa
2022-05-04Snap for 8540474 from 90e8ced9732061b01e782696ca16e69aa9423c4d to tm-releaseAndroid Build Coastguard Worker
Change-Id: I0388c63e0dd8be93cca2ad2a4a255b77799368de
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-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-28Snap for 8508895 from 98a43e2e56e050b68da39648d4ecfb500ad5befa to tm-releaseAndroid Build Coastguard Worker
Change-Id: Iafbd1694f4e9f41d93b174a206fdce4473ea3755
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-20Snap for 8474198 from 894e1c9930c59eb7bba11c221ca7d9fd6167c30c to tm-releaseAndroid Build Coastguard Worker
Change-Id: Ia019580dd85cd73bbe7fd5ec254ba7c89c8b9075
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-03Snap for 8401211 from 8c9eeaaa9d841a4fb23dea47fcb9ce47de4847d6 to tm-releaseAndroid Build Coastguard Worker
Change-Id: I498f6c7b34eb0038c99670c914fd8f1341e081d6
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-29Snap for 8372459 from d833a87111be3c6885e3ea75865af7025b14f1b5 to tm-releaseAndroid Build Coastguard Worker
Change-Id: Iea6e07e79ce618d332baf402038b91f3a3eb8b42
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>
2022-03-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
bafc88865b -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2045863 Change-Id: I8898ade74128cd8760863ad6cb791dea79a58b9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-masterTreeHugger Robot
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: Iaf5010d25a5f20188308a08bcfff4532e75c9369
2022-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I34fd08d8427fb33187960699b77dbcba51183b98
2022-03-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I86e442d281f955f9c19fe3ef9a5c85421b6acfcc
2022-03-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ic1413c62a0f214d2ca4b00f63038ccc81120e65c
2022-03-10Snap for 8283941 from edf4e88c642f6f60ed9d75ebf4a8817857947fb2 to tm-releaseAndroid Build Coastguard Worker
Change-Id: I08bd3c7140f39401eefe57bc2483566f9ac1327e
2022-03-09[automerger skipped] Merge Android 12L am: b294f2ba36 -s ours am: cdb8acd8cc ↵Xin Li
-s ours am: bdb75e7201 -s ours am skip reason: Merged-In Ibdbea20a6d5c4a8a36b5317abea3e68dd397e9db with SHA-1 6a7d7752e1 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2013319 Change-Id: I5bb258467a87494e7c3687e3c7288dfa1b84f94f
2022-03-08[automerger skipped] Merge Android 12L am: b294f2ba36 -s ours am: cdb8acd8cc ↵Xin Li
-s ours am skip reason: Merged-In Ibdbea20a6d5c4a8a36b5317abea3e68dd397e9db with SHA-1 6a7d7752e1 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2013319 Change-Id: I0767ec68085597e67d730ef1a6decfb92d8d6370
2022-03-08[automerger skipped] Merge Android 12L am: b294f2ba36 -s oursXin Li
am skip reason: Merged-In Ibdbea20a6d5c4a8a36b5317abea3e68dd397e9db with SHA-1 6a7d7752e1 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2013319 Change-Id: I9abeb0d4cc2bf2c57053894798fe83aed9a9450e
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: Ibdbea20a6d5c4a8a36b5317abea3e68dd397e9db Change-Id: If3eb3119a7abe34a26a19a1a5a3e4d1dec52d03d
2022-02-15Snap for 8183382 from ed83c5b3fb5d52ab0d0d350e9af48f833c367618 to tm-releaseAndroid Build Coastguard Worker
Change-Id: Iabca805102e7c6462ead5992da1f29f412921a3f
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
6a7d7752e1 -s ours am: c0a194a15c -s ours am skip reason: Merged-In I09020358c687af85593d3d8e2d7b0c75cc022357 with SHA-1 d39087ea76 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/16844577 Change-Id: Ic68cb14be8a0c54a2e6b4a643c095c266bb89d65
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
6a7d7752e1 -s ours am skip reason: Merged-In I09020358c687af85593d3d8e2d7b0c75cc022357 with SHA-1 d39087ea76 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/16844577 Change-Id: I37a053d0899d7e41cf3d39d42331dea09e3ebe30
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 05:22:55 +0000