summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-03-18[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseBill Yi
d01f01961e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22130661 Change-Id: I8c88ac9874db343c2ce3c5f183df10bb9a367669 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Import translations. DO NOT MERGE ANYWHEREandroid14-devBill Yi
Auto-generated-cl: translation import Change-Id: Ib007a5a5d48c8387a09460d0255d15b1d581cd45
2023-03-16Merge changes from topic "tc_change_23031509_19" into udc-dev am: 8d593078a6TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090156 Change-Id: I9e4f9e365970f458ea347f82d504266ba65c359a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ↵Bill Yi
ANYWHERE 2p: b3a4b4db6e am: 8f6192cd94 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090156 Change-Id: I345c8af0e4b0a114900f3b4cf36a639c37fb92de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-devTreeHugger Robot
2023-03-16Merge changes from topic "tc_change_23031509_19" into udc-devTreeHugger Robot
* changes: [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b3a4b4db6e Import translations. DO NOT MERGE ANYWHERE
2023-03-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
9ec539e294 -s ours am: 5a87ce1b03 -s ours am: 675d306424 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090654 Change-Id: I0a3b50e8b624764c173015569b22ea198f2c6a14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
9ec539e294 -s ours am: 5a87ce1b03 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090654 Change-Id: I9ff60ec967a75fbe898c1138b80eeb8cbe846490 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
9ec539e294 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090654 Change-Id: I93dafc01cf3797053c681f0961a9c9fa015452d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b3a4b4db6eBill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090156 Change-Id: Ica181192dc057cbe321cab3bdc61dcc69c594fd8
2023-03-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I864dc0bcef3e7a654f01771c04a1a6ca30b790b6
2023-03-14Import 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: Iaf32c36c65314a371642a30ecb2bba251adbc20c
2023-03-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ic3c21706454d6c1ecf9b4f14bb8338a7fd843d74
2023-03-01[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
stage-aosp-master am: 66bef1dfee -s ours am: 7a5b14bd26 -s ours am: c5a5a94e38 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180 Change-Id: Ic452d33a6dc0b43730924d0a8b83cc4312bfc600 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
d92da8adff -s ours am: 956107b4a1 -s ours am: 00ed4fea00 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180 Change-Id: I53ded546f2d8405bdc8eb1578d5d3b7eb739d171 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
0ed48f3581 -s ours am: ff3b8ffe16 -s ours am: 31583166d1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605179 Change-Id: I615f2df0c9f5728c00ed6932ff16c40f8813b339 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
stage-aosp-master am: 66bef1dfee -s ours am: 7a5b14bd26 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180 Change-Id: Idee635caf4c15df7f2fbd74ad8ed250871423cb1 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
d92da8adff -s ours am: 956107b4a1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180 Change-Id: I1ce9448184def866c31ea95c4e0382a9193c47e3 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
0ed48f3581 -s ours am: ff3b8ffe16 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605179 Change-Id: I51b9f3dd811e1461e467ae50ca952f522a5063f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
stage-aosp-master am: 66bef1dfee -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180 Change-Id: Ia09654586cba6be93f264693a9fadba6e6e0fce8 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
d92da8adff -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605180 Change-Id: Ibcb096211aa6ef66491caae74c6a7be98ff6f15b 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
0ed48f3581 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/21605179 Change-Id: Ibe022189e36ab4a7d037c88d9f1a8a132d29bd83 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-masterandroid-u-beta-1-gplTreeHugger Robot
2023-02-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I606a92a21581c5ab64770b75e7b80da7f2d6d56e
2023-02-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ibfefeedbebaa7766fac5e9da6f0c6d8ac81c9eb5
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
0da01a5946 -s ours am: 88b60e7db8 -s ours am skip reason: Merged-In Ide26e9310f6057a44cbaa6c07b6475e3ad893dd2 with SHA-1 fe40e72682 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20956668 Change-Id: I906db112422209075731455b20dd76386c53939e 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
0da01a5946 -s ours am skip reason: Merged-In Ide26e9310f6057a44cbaa6c07b6475e3ad893dd2 with SHA-1 fe40e72682 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20956668 Change-Id: If732e5474f0e8e39d5338872368d685024e86eef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
tm-mainline-prod am: 10a39ac8aa -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20847212 Change-Id: Id564de39ee3f0c0cbc634a19dff1b63f2b853f31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
928ddff7c1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20847212 Change-Id: Ia1c981ffe6ed14b711453046f6db48ab8d25e0da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e84259b6d9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20847213 Change-Id: I16a2d79f0e088d225198068860eb271b6bbb945e 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: Ide26e9310f6057a44cbaa6c07b6475e3ad893dd2 Change-Id: Ic518b50bfb6c5a24add59e62deed499bc2310bbc
2023-01-11[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
tm-mainline-prod am: 57a3ce0c8c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20758374 Change-Id: Ia93744dfba20876e36b48ceb835327d5a3b716e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
16106f8077 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20758374 Change-Id: I7c7ea36e6499d0f932b7a353757ba481eeff6e82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
bd3fbfdb9e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20758847 Change-Id: Ic546810592d97187663aa2b2367e1ec57d66947f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
tm-qpr-dev am: 77d8ed7bfd -s ours am: 6a032058f4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20846540 Change-Id: I7460ce354ff1233a07d047bc5ac0000f9c10bcd2 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
fe40e72682 -s ours am: 565efadf16 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20846540 Change-Id: Iaabccbae3ef32d1983fe35b37bb86e138ee74bac 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
965811ef4a -s ours am: 288990ef89 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20846539 Change-Id: I61472ae45e0e3007e2d9f36ab4a1d734e1c11e10 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-03[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
tm-qpr-dev am: 77d8ed7bfd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20846540 Change-Id: I2da6a8fe6627a8403cb4c593f051fc6636b307bb 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
fe40e72682 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20846540 Change-Id: I69295aacc3a91660d87530178dfe8502e19b7a68 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
965811ef4a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20846539 Change-Id: I0f1cb5425f19ec6d0fbe8cc44f6e1ea728101617 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-31Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-31Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-devTreeHugger Robot
2022-12-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2812c6468cb2dc89e38e70ddd92072235438c4e1
2022-12-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ifd90616bdc52865974c245893a8dba1a864e82af
2022-12-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ide26e9310f6057a44cbaa6c07b6475e3ad893dd2
2022-12-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I0b46878fbaf7461c690e86820c868f20fc71bc30
2022-12-17[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Bill Yi
tm-qpr-dev am: 66028e58ec -s ours am: f398f4aea7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20758379 Change-Id: I848aa195bfcb7e8724f4cdfc778178ec9096af1a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
76a1f05bb5 -s ours am: 99686db864 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20758379 Change-Id: Ibf8c830f602f5299d68aa6f565333825300d4de5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1696376de2 -s ours am: f2361fb0cd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/20758377 Change-Id: Ia66bdd6f475b37f8931588ce1b94b3276452d670 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 21:53:50 +0000