summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
11 daysMerge "Migrate Test Targets to New Android Ownership Model" into mainHEADmastermainTreehugger Robot
11 daysMigrate 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: If3dcee94f0d21ccf6f757638a4f65a23378b8a13
2024-03-07Merge "Merge Android 14 QPR2 to AOSP main" into mainXin Li
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: I6dcbe0dddbda0734a3e8351c79d0329ae26a2db6 Change-Id: I42aeec49ff8b07efa2126582c3f1b3cec6339b16
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I87a1e2961f6737d107687d130e87324d3649c71b Change-Id: I6dcbe0dddbda0734a3e8351c79d0329ae26a2db6
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 4f68c72394 ↵Xin Li
-s ours am: 47f3bad4ef -s ours am: 73f6b6822c -s ours am skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657 Change-Id: Ic35389e5b7dc926e093d7efadedd35d2e2e6992c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 8fbfe4ea28 -s ours am: ↵Xin Li
872ecc3e95 -s ours am: 8584fb67f6 -s ours am skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657 Change-Id: I700f14bbffb9a4c04c4f61d006391d843f03ac50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 4f68c72394 ↵Xin Li
-s ours am: 47f3bad4ef -s ours am skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657 Change-Id: Ib393696a6dc6bc4aca2d6fe7b739c319086ce158 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 8fbfe4ea28 -s ours am: ↵Xin Li
872ecc3e95 -s ours am skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657 Change-Id: Ida93ec32e32ded2a73cc1b5a12f86120e58c51fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 4f68c72394 ↵Xin Li
-s ours am skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657 Change-Id: I0f3a6758b7e2cc5a923b211794c0ca3e2ebcb2f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 8fbfe4ea28 -s oursXin Li
am skip reason: Merged-In Ib9e965e47015ff54230ee7863bc4ec4bac510133 with SHA-1 6da1906643 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2865657 Change-Id: I25de2c01165587a79161fae491a57fb83a83d66c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09Merge "Merge Android 14 QPR1" into mainXin Li
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: Ib9e965e47015ff54230ee7863bc4ec4bac510133 Bug: 315507370 Change-Id: Ia4f4219216922dbea9076e4742e8d2486df9a66c
2023-10-19[automerger skipped] Merge 10952656 am: 6da1906643 -s ours am: 03ab3b0be8 -s ↵Xin Li
ours am skip reason: Merged-In I99ad17cdfa0324e623b4674332922c8bf2db263e with SHA-1 1fd1f257fa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/25089498 Change-Id: Icf75608f5f1a23bf9b7c0af9bf6f3df9a8216788 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19[automerger skipped] Merge 10952656 am: 6da1906643 -s oursXin Li
am skip reason: Merged-In I99ad17cdfa0324e623b4674332922c8bf2db263e with SHA-1 1fd1f257fa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/25089498 Change-Id: Icf46499c811f0764e5df35041284a50f8879d525 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: I99ad17cdfa0324e623b4674332922c8bf2db263e Change-Id: Ib9e965e47015ff54230ee7863bc4ec4bac510133
2023-10-07Merge "Clean up obsolete aliases for Truth." into main am: b56668e8a0 am: ↵Krzysztof Kosiński
c21a09b09a am: f96ef6ebef am: 7ced43455c am: 1fd1f257fa Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2777193 Change-Id: I532538c149d92e23ab7f7d1c180d9bbaa5ec60cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Merge "Clean up obsolete aliases for Truth." into main am: b56668e8a0 am: ↵Krzysztof Kosiński
c21a09b09a am: f96ef6ebef am: 7ced43455c Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2777193 Change-Id: I99ad17cdfa0324e623b4674332922c8bf2db263e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Merge "Clean up obsolete aliases for Truth." into main am: b56668e8a0 am: ↵Krzysztof Kosiński
c21a09b09a am: f96ef6ebef Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2777193 Change-Id: I014dfd10061f07931f5c3d83df1beb9420f5ad85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Merge "Clean up obsolete aliases for Truth." into main am: b56668e8a0 am: ↵Krzysztof Kosiński
c21a09b09a Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2777193 Change-Id: Ia379738f70863b4dfbb0038e3f2a9c1bf5bdc814 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Merge "Clean up obsolete aliases for Truth." into main am: b56668e8a0Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2777193 Change-Id: I19a48a5eec01615a7d7d2b4197993d58d5d096cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Merge "Clean up obsolete aliases for Truth." into mainKrzysztof Kosiński
2023-10-07Clean up obsolete aliases for Truth.Krzysztof Kosiński
Bug: 255714762 Test: presubmit Change-Id: I80401651c880bff5ced9e9d0e1b80cbe94dc9bb1
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: caf06987b8 -s ↵Xin Li
ours am: 17193da7c5 -s ours am: 8252296117 -s ours am: 32b684b06b -s ours am: d258f21610 -s ours am skip reason: Merged-In Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b with SHA-1 1ec7b2cee6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2775839 Change-Id: I2a1b09d3e0a919b825484d9f4f7b6d2081fbafae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07[automerger skipped] Merge Android 14 am: 35561cdc95 -s ours am: 9e9c79da42 ↵Xin Li
-s ours am: f4bb2f7590 -s ours am: d7c94f147f -s ours am: 26b6ec202b -s ours am skip reason: Merged-In Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b with SHA-1 1ec7b2cee6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2775839 Change-Id: I4a14ab80128f435782cc74fd7fa6713b43dbe394 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: caf06987b8 -s ↵Xin Li
ours am: 17193da7c5 -s ours am: 8252296117 -s ours am: 32b684b06b -s ours am skip reason: Merged-In Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b with SHA-1 1ec7b2cee6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2775839 Change-Id: I613b12d598547625ffbbdd5115f8dbe500df1df2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 35561cdc95 -s ours am: 9e9c79da42 ↵Xin Li
-s ours am: f4bb2f7590 -s ours am: d7c94f147f -s ours am skip reason: Merged-In Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b with SHA-1 1ec7b2cee6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2775839 Change-Id: Ic9a90c3c576d884562d23fa74047f735390d58c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: caf06987b8 -s ↵Xin Li
ours am: 17193da7c5 -s ours am: 8252296117 -s ours am skip reason: Merged-In Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b with SHA-1 1ec7b2cee6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2775839 Change-Id: I4204ad395118b6c6206a41b5806533d7314a392f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 35561cdc95 -s ours am: 9e9c79da42 ↵Xin Li
-s ours am: f4bb2f7590 -s ours am skip reason: Merged-In Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b with SHA-1 1ec7b2cee6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2775839 Change-Id: I55ac51e8b7a9b3f54b2043cd07bd0b7b6b09282a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: caf06987b8 -s ↵Xin Li
ours am: 17193da7c5 -s ours am skip reason: Merged-In Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b with SHA-1 1ec7b2cee6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2775839 Change-Id: I40905da3d0759f94310166e5b0655d8763dffa2a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 35561cdc95 -s ours am: 9e9c79da42 ↵Xin Li
-s ours am skip reason: Merged-In Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b with SHA-1 1ec7b2cee6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2775839 Change-Id: I416d0daed9162f6293d3b63847217b857e979f06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: caf06987b8 -s oursXin Li
am skip reason: Merged-In Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b with SHA-1 1ec7b2cee6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2775839 Change-Id: Ib1a167970ee16707ca327dff0daf867ef5c667cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 35561cdc95 -s oursXin Li
am skip reason: Merged-In Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b with SHA-1 1ec7b2cee6 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2775839 Change-Id: I5516fdf80481e19cab8221562864a806b2065b6b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge "Merge Android 14" into mainXin Li
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: Ia2471afae4b92c3eb56d810532ff2cfd324e2f4b Change-Id: I178ef89e797133f4a0cee843425a7c120a80884e
2023-09-27Use androidx LargeTest annotation for device tests.Anna Zhuravleva
Platform_testing large test annotation is for host side tests and restricted, device tests should use androidx annotation. Bug: 293837621 Test: presubmit Change-Id: I87a1e2961f6737d107687d130e87324d3649c71b
2023-09-26Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
3a91d9b048 -s ours am: 1cd2017582 -s ours" into udc-d1-dev-plus-aosp am: 111f65886d -s ours am: eb81852a0c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I1b4de23eff4f3f7223a892b7d70f02b2a2d1aedf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am: 1cd2017582 -s ours am: 727d496b56 -s ours am: 1b76e8ae8e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: Ief47f777678e9c10aed127e829159e07abbaa197 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
3a91d9b048 -s ours am: 477a66cc75 -s ours am: f0432be2ed -s ours" into udc-qpr-dev-plus-aosp am: 3f42ee7ffe -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: Ieafaab6578d353cc022c94ac3162c21d2fb3c41d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am: 477a66cc75 -s ours am: f0432be2ed -s ours am: 9008954698 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I1a74bfbe7da8212b6ee70eb2a48aa26dc2b5748a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
3a91d9b048 -s ours am: 1cd2017582 -s ours am: bc111e2806 -s ours" into udc-qpr-dev-plus-aosp am: d9be1e8091 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I8561d95a136029e4d6fbc926f3c7607101cec831 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am: 1cd2017582 -s ours am: bc111e2806 -s ours am: cc1ac536f0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I1220134349bd320c25dcefa1cae673ff1fc9615d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d6832a78dc -s ours am: 4944e00877 -s ours am: 09db258b67 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24835940 Change-Id: I0570e6a91d00bece33e06adda6cd5c2037e84eab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
3a91d9b048 -s ours am: 1cd2017582 -s ours" into udc-d1-dev-plus-aosp am: 111f65886d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I85a3eb2aedc96c8f427b31aa13d2765b3f16fabf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am: 1cd2017582 -s ours am: 727d496b56 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I596b57e73e6713ce40d8c849ca908b965f1b0a4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
3a91d9b048 -s ours am: 477a66cc75 -s ours am: f0432be2ed -s ours" into udc-qpr-dev-plus-aosp
2023-09-25Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Automerger Merge Worker
3a91d9b048 -s ours am: 1cd2017582 -s ours am: bc111e2806 -s ours" into udc-qpr-dev-plus-aosp
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am: 477a66cc75 -s ours am: f0432be2ed -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: Ib4825e5c010a7017c4167a93771c57d17caedbd6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3a91d9b048 -s ours am: 1cd2017582 -s ours am: bc111e2806 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24836102 Change-Id: I4e6a5e0fd5b8bc6f2f4df90b7527faebf29db212 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d6832a78dc -s ours am: 4944e00877 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24835940 Change-Id: I58d7e5a4eb3aa82707476eba49e36c4ed5c3a359 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-05-03 10:15:53 +0000