summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
13 daysMerge "Migrate Test Targets to New Android Ownership Model" into mainHEADmastermainTreehugger Robot
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: Ie64efbb772560dddcca0142e712ee8c55799af88 Change-Id: Iddd73ff8bd6b3ae233551dbc0cd8aaa3e9ff8c11
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: Id28e6cc171f489042a92a2f0449c75dec3feb03d
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I7f7bdc40d27e43c4c3876a50a66d66a5dedcfe86 Change-Id: Ie64efbb772560dddcca0142e712ee8c55799af88
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 0249c2b7dc -s ours am: ↵Xin Li
0e0418f449 -s ours am: 4bcbe428b7 -s ours am skip reason: Merged-In I77ab39e0e91d506102ce3aa55c86fa627638b617 with SHA-1 d09def04dc is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2865158 Change-Id: I13364e702b4639dd9841c20f3972ed3a3222e3cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 0249c2b7dc -s ours am: ↵Xin Li
0e0418f449 -s ours am skip reason: Merged-In I77ab39e0e91d506102ce3aa55c86fa627638b617 with SHA-1 d09def04dc is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2865158 Change-Id: Ib722fddb361a9f71a78f357ccbdd6348bbcda71f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 0249c2b7dc -s oursXin Li
am skip reason: Merged-In I77ab39e0e91d506102ce3aa55c86fa627638b617 with SHA-1 d09def04dc is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2865158 Change-Id: I86662280e9c5b18bf55aa28580f611d72313e8e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I77ab39e0e91d506102ce3aa55c86fa627638b617 Bug: 315507370 Change-Id: Ie8c1c873c22b1eb211f2e30041c6ed06d9b6907a
2023-11-16[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
56aa4d3772 -s ours am: 11b6a50bb9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/25374659 Change-Id: Ida2318d37b8e43c2ee0969d39a3c054826bac49f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
56aa4d3772 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/25374659 Change-Id: I95e0d8f94475b89ee73338c080f7b8e4b36b3fae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge "Import translations. DO NOT MERGE ANYWHERE" into mainBill Yi
2023-11-16[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
8eaee9a36f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/25374837 Change-Id: If2c95ee7e6208bca73e422c2c35194a0f9d767da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7f7bdc40d27e43c4c3876a50a66d66a5dedcfe86
2023-11-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie44c3277e8d687622b87d83c968abb8acaddb215
2023-11-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ic624a9e68c08d54f35d921d2d78e2754220f382f
2023-10-23[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
a32f035af1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/25128835 Change-Id: Id2035f536a97d9c240d29435fce26c6e4c737d29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I088d345cc863f4dc7340c835370c2d904cb7dc54
2023-10-20Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: If97a6e451132f2e95b20dc21c67198a391b57110
2023-10-19[automerger skipped] Merge 10952656 am: d09def04dc -s ours am: cddde9ec3d -s ↵Xin Li
ours am skip reason: Merged-In Ia25e496f6fff34c9e991cfea7c1a4f6a4b204876 with SHA-1 cab0eeee32 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/25090142 Change-Id: Ia468c5ab0887700e462b1273570c3b70ee745011 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Merge "Fix EmergencyInfo for use_resource_processor: true" into mainTreehugger Robot
2023-10-19[automerger skipped] Merge 10952656 am: d09def04dc -s oursXin Li
am skip reason: Merged-In Ia25e496f6fff34c9e991cfea7c1a4f6a4b204876 with SHA-1 cab0eeee32 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/25090142 Change-Id: I4190ccb952f118b9903e5ea5719f327e678b4317 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: Ia25e496f6fff34c9e991cfea7c1a4f6a4b204876 Change-Id: I77ab39e0e91d506102ce3aa55c86fa627638b617
2023-10-17[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
965edd9cf9 -s ours am: 22dba853db -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/25067096 Change-Id: Ib81864f3578825e0b2bc66a988725bfb18d695ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
965edd9cf9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/25067096 Change-Id: Ia1158c225df8af60dde78fc70f7ed89ca3e0b318 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id2c24d6e0133411b8a0f16bde6404ce19a2a7105
2023-10-07Clean up obsolete aliases for Truth. am: f229238917 am: 4758463347 am: ↵Krzysztof Kosiński
cfe15c6235 am: 9d41b8b686 am: cab0eeee32 Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2778093 Change-Id: I23f16e5e0bd700f0b265de1a836a47369c511a96 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: f229238917 am: 4758463347 am: ↵Krzysztof Kosiński
cfe15c6235 am: 9d41b8b686 Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2778093 Change-Id: Ia25e496f6fff34c9e991cfea7c1a4f6a4b204876 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: f229238917 am: 4758463347 am: ↵Krzysztof Kosiński
cfe15c6235 Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2778093 Change-Id: Icb63efdebd24d612e2bd1351f5a7a83e325764db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: f229238917 am: 4758463347Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2778093 Change-Id: Ib00efeac9b6604df2c4fbdf055b374f73f3d8fbb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth. am: f229238917Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2778093 Change-Id: I44cd29560e80ac79259529e5e805b66aad1e95e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07Clean up obsolete aliases for Truth.Krzysztof Kosiński
Bug: 255714762 Test: presubmit Change-Id: I16f7e59623eebea06779949703af91bf3924d2ec
2023-10-07[automerger skipped] Merge Android 14 am: ee5fd8a652 -s ours am: bc30318c38 ↵Xin Li
-s ours am: b87cf9eaf0 -s ours am: 1cb8a4b367 -s ours am: 33398df506 -s ours am skip reason: Merged-In I84e5b1b94305193449709e667b45c267a44bc453 with SHA-1 ba5376b438 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2776990 Change-Id: I99df1321e9b4d06155e8a8258ff9b2ac0a4308fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: ee5fd8a652 -s ours am: bc30318c38 ↵Xin Li
-s ours am: b87cf9eaf0 -s ours am: 1cb8a4b367 -s ours am skip reason: Merged-In I84e5b1b94305193449709e667b45c267a44bc453 with SHA-1 ba5376b438 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2776990 Change-Id: I60f71effb54240c2153ad749ad82d8921a955e90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: ee5fd8a652 -s ours am: bc30318c38 ↵Xin Li
-s ours am: b87cf9eaf0 -s ours am skip reason: Merged-In I84e5b1b94305193449709e667b45c267a44bc453 with SHA-1 ba5376b438 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2776990 Change-Id: I09f3d7e288e7b857432454ee8f2ba83b6001f64a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: ee5fd8a652 -s ours am: bc30318c38 ↵Xin Li
-s ours am skip reason: Merged-In I84e5b1b94305193449709e667b45c267a44bc453 with SHA-1 ba5376b438 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2776990 Change-Id: I7514dd2ca48d677d9b15a0b4fb91078f3b439260 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: ee5fd8a652 -s oursXin Li
am skip reason: Merged-In I84e5b1b94305193449709e667b45c267a44bc453 with SHA-1 ba5376b438 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/2776990 Change-Id: I08bd67a12ea9cebb3ad36cd1a1b505aeae16c64e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I84e5b1b94305193449709e667b45c267a44bc453 Change-Id: Ida4258272ed091d8fb1dc16037ac54a7f3c828fd
2023-10-04Fix EmergencyInfo for use_resource_processor: trueColin Cross
Use a separate package name in the AndroidManifest.xml for each android_library. Reference resources using the package name of the library that includes them. Bug: 294256649 Test: m javac-check Change-Id: Ic1e4030a54dfc6e9fadf77317ab237852abe5e9b
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ba5376b438 -s ours am: f7bce0dbb0 -s ours am: 260a41c690 -s ours am: a5598ca796 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/24607150 Change-Id: Id806ccdff2a446f8b0adf183a60e408bde63022c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ba5376b438 -s ours am: f7bce0dbb0 -s ours am: 260a41c690 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/24607150 Change-Id: I048e32856b50d4565023df21143eeb57127ef2d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ba5376b438 -s ours am: f7bce0dbb0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/24607150 Change-Id: I244462b9af56597eb0fad575789e9d3106e4c52c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ba5376b438 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/24607150 Change-Id: I40a88aeb805a18593648597dbf85fe5ccb35367d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30Import translations. DO NOT MERGE ANYWHEREtmp_amf_298295554Bill Yi
Auto-generated-cl: translation import Change-Id: I84e5b1b94305193449709e667b45c267a44bc453
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: da512fa97c -s ours ↵Xin Li
am: 786d5e2b08 -s ours am: 18e3d72f34 -s ours am: 8eec9cbbec -s ours am skip reason: Merged-In I9dd0531b069ff70e7823d03ef888d28c0cafcdea with SHA-1 7dc0d830d9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/24181978 Change-Id: I9bf7b0d28289808715d9f8c77747cf2192a5a132 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: da512fa97c -s ours ↵Xin Li
am: 786d5e2b08 -s ours am: 18e3d72f34 -s ours am skip reason: Merged-In I9dd0531b069ff70e7823d03ef888d28c0cafcdea with SHA-1 7dc0d830d9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/24181978 Change-Id: Ifbe6a6bb61123cbf550ddd5f90556fe08c66b498 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: da512fa97c -s ours ↵Xin Li
am: 786d5e2b08 -s ours am skip reason: Merged-In I9dd0531b069ff70e7823d03ef888d28c0cafcdea with SHA-1 7dc0d830d9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/24181978 Change-Id: I78d5c06738ac6386eaf4a7f0d105d42f404859ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: da512fa97c -s oursXin Li
am skip reason: Merged-In I9dd0531b069ff70e7823d03ef888d28c0cafcdea with SHA-1 7dc0d830d9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/24181978 Change-Id: I0f1aad753269469ddfa395a76027ae46280e469d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Bill Yi
udc-d1-dev am: d71e0959bd -s ours am: 70abd007f4 -s ours am: bc15df2c4b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/24529218 Change-Id: I7d52210a8b08fa64ee42c99157bd8c2e02c68684 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
60876135fa -s ours am: 5b19263cc7 -s ours am: 35ad79b041 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/24529218 Change-Id: Ief857700a88278c6b867ce73f1e6e0235348bf2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Bill Yi
udc-d1-dev am: d71e0959bd -s ours am: b0f0d99791 -s ours am: 2358ac33ae -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/24529218 Change-Id: I921e43704b99df432719c7075ce480154f296d11 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-05 09:18:20 +0000