summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-07Snap for 11541002 from 48e708cfca0b8df3df343c3b90e84c73debb2fd3 to sdk-releaseplatform-tools-35.0.1sdk-releaseAndroid Build Coastguard Worker
Change-Id: I6980442f4aedac16d8d3609e5c3038d2ed82b557
2024-02-14Snap for 11445705 from 1795c524ecc05db7fac1bf748cd5db1a679eb737 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ib268dd40979244bac5d9057816699da7151a1793
2024-02-13Migrate Test Targets to New Android Ownership Model am: 1795c524ecHEADmastermainAditya Choudhary
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2946471 Change-Id: I6b12a255f52b5f2f878d09a6ecaf8472f202faf0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: I5102072834022aa034a913b14bd3d13807a7ca8e
2023-12-13Snap for 11211409 from bf22bbbd6fc1300a92c870b8b1657afa0cb8b565 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I8e0ec4a0fbafed443c2493e4524dcb360c0cd942
2023-10-10Snap for 10929834 from 784e6b66d49a2c7f89e53ea8a25fa45736020ecd to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I3699cda9adec0bd9ba6584ff30b20d3c60407ecb
2023-06-28Snap for 10399941 from 67004ed4a45f7d656884781b5b64f9521957aad5 to sdk-releaseplatform-tools-34.0.5platform-tools-34.0.4Android Build Coastguard Worker
Change-Id: I7b7d9a5eb58ac77ddee2968aa1dd3155789b5698
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseBill Yi
e14dcd5e73 -s ours am: 67004ed4a4 -s ours am: 5adb1ce42c -s ours am: 784e6b66d4 -s ours am: 3f3ebde396 -s ours am: bf22bbbd6f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2614150 Change-Id: Id9b9c62dc2113c20cdf8857bb6c38a2837b9f56e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e14dcd5e73 -s ours am: 67004ed4a4 -s ours am: 5adb1ce42c -s ours am: 784e6b66d4 -s ours am: 3f3ebde396 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2614150 Change-Id: Id6b4deb1f08a17a697d1f5e0dccfa9c343e1ca50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e14dcd5e73 -s ours am: 67004ed4a4 -s ours am: 5adb1ce42c -s ours am: 784e6b66d4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2614150 Change-Id: Ie52f2cc659f2498a01346ce34f58cf69a4b4ef81 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e14dcd5e73 -s ours am: 67004ed4a4 -s ours am: 5adb1ce42c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2614150 Change-Id: Id3e733500d3f726fcdc4f892c1aeb2436ea1a2f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e14dcd5e73 -s ours am: 67004ed4a4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2614150 Change-Id: I93ea21ed67eda4efb520c670e802e502e622706a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e14dcd5e73 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2614150 Change-Id: Ida6d3b997b1628030f1faa80a888e5df07d0b1bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I825b1a672bd983938871aebb2d174a0ef2a91cd0
2023-04-29[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ea712047c4Bill Yi
Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22920822 Change-Id: I15ddb970b200df075f4ac8a1bbd06e35eb2a1adb
2023-04-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I56e0ac27b01deda600a0129439631e2242730d1c
2023-04-25[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Treehugger Robot
stage-aosp-master am: 50a59f7427 -s ours am: eb6ef3face -s ours am: 0a97c09310 -s ours am: 10f408131f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22801585 Change-Id: Ica03f64a99dccd46fd149293219f538f7c6fa9b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
194dafa637 -s ours am: e683576b1b -s ours am: cbd77b18f1 -s ours am: 3925b1ccea -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22801585 Change-Id: I37221df77c7aa399b748668797183e9540605077 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7faba7d3a5 -s ours am: 9040013d03 -s ours am: 878a9fb0fb -s ours am: 9b48d98763 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22801270 Change-Id: I275f02e27d481b9eed0b47a39c2709db722d1a6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Treehugger Robot
stage-aosp-master am: 50a59f7427 -s ours am: eb6ef3face -s ours am: 0a97c09310 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22801585 Change-Id: If311772ebd266a359d4486b1864111b61bbd3118 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
194dafa637 -s ours am: e683576b1b -s ours am: cbd77b18f1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22801585 Change-Id: Ie6fff50eb99c9087f6582df1840d412a98cd9969 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7faba7d3a5 -s ours am: 9040013d03 -s ours am: 878a9fb0fb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22801270 Change-Id: Iefd2b256fe15c4fa27536bc937e763e3841126fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Treehugger Robot
stage-aosp-master am: 50a59f7427 -s ours am: eb6ef3face -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22801585 Change-Id: I90276774a29cbb279f54f8e9af94110466eb4455 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
194dafa637 -s ours am: e683576b1b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22801585 Change-Id: Id490402ae6722c573a889607598f4379af7378f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7faba7d3a5 -s ours am: 9040013d03 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22801270 Change-Id: Ifc44ca3b7d0efb7ce3efd6c695466d76698c05de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Treehugger Robot
stage-aosp-master am: 50a59f7427 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22801585 Change-Id: I43f467e16e4b476365c3c3939de6f1efde0918f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
194dafa637 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22801585 Change-Id: If7ecc4cefaa54742c90038d5b22d598ef477e9ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7faba7d3a5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22801270 Change-Id: I16d6dafbb1a93a5117c78ad53de2bd476dcc578d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-masterTreehugger Robot
2023-04-22Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I76f36164186fbf89c515747781d503d987e2d456
2023-04-22Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iff6c1e40aa4f04037ad1fc430d8d4baee88b18ec
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 469015bbf1 -s ours am: 3cfcd33863 -s ours am: 1b47525e40 -s ours am: 9f381f21f7 -s ours am skip reason: Merged-In Iaf32c36c65314a371642a30ecb2bba251adbc20c with SHA-1 9ec539e294 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22726226 Change-Id: I482851e12c0cc45eb9f87aa4acbc521ca5e96009 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 469015bbf1 -s ours am: 3cfcd33863 -s ours am: 1b47525e40 -s ours am skip reason: Merged-In Iaf32c36c65314a371642a30ecb2bba251adbc20c with SHA-1 9ec539e294 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22726226 Change-Id: I840e864f6a8a032853bb01a95668516194284502 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 469015bbf1 -s ours am: 3cfcd33863 -s ours am skip reason: Merged-In Iaf32c36c65314a371642a30ecb2bba251adbc20c with SHA-1 9ec539e294 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22726226 Change-Id: I1d0349af56ee063e752040a4a0643e7dde4972f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 469015bbf1 -s ours am skip reason: Merged-In Iaf32c36c65314a371642a30ecb2bba251adbc20c with SHA-1 9ec539e294 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22726226 Change-Id: Ie6741a99ce9450602ce0b957efa814def4de444d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20Snap for 9979206 from 66bef1dfee4b000e441a01e08ef3223b8cc4fb56 to sdk-releaseplatform-tools-34.0.3Android Build Coastguard Worker
Change-Id: Ie87572a08e3e71013170e2df51fa36f1d79955fc
2023-04-18Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994Xin Li
Bug: 275386652 Merged-In: Iaf32c36c65314a371642a30ecb2bba251adbc20c Change-Id: I08666ebd9499faaedda00b82fb7f611922b500df
2023-03-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d01f01961e -s ours am: 69f782fb55 -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: Id663a47457e6eceacdf731e5771e0481a0718dfd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d01f01961e -s ours am: 9b7eb5fe46 -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: I64a6bb92413b2e439fc38dcb5e2dc1e0757123f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-18[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill 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: I5996073f0f6cda5fff9e9ca0e3cff588c23abced Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I5d9626d7161661aecc3af558625e6d1b662f9666
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: 8d593078a6 ↵TreeHugger Robot
am: 57ddf5f4e6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090156 Change-Id: Ibad111c89ff9bb66abe7f80bba3ca79f74d9cb3b 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: e31ff320f0 -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: Ifa6d3945da6d0e3db9937bdcd3ced659889df311 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
udc-d1-dev am: ab6f35ba8f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090655 Change-Id: I4ae3d36a540e7106d07935ba78ca8969c1a6f38c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
79c8fea394 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090655 Change-Id: Ided734e811da81d869a4a937abacebc034dfef9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16Merge changes from topic "tc_change_23031509_19" into udc-dev am: 8d593078a6 ↵TreeHugger Robot
am: 8c36d8a1c6 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/22090156 Change-Id: Ie0259309bc356f8a1d23b5be32fa3c54438f3143 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: 143491dff5 -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: Id60260bdfceb069bf5239a2a973a5d755084853a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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>