summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-12Merge "Snap for 11566117 from 1c66c576c9f04f252e283b27e5683d24c09dee98 to ↵platform-tools-35.0.1sdk-releaseAndroid Build Coastguard Worker
sdk-release" into sdk-release
2024-03-12Snap for 11566117 from 1c66c576c9f04f252e283b27e5683d24c09dee98 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I009ff8b46590ec5ba5234e36359ff230272d11ff
2024-03-07Merge "Merge Android 14 QPR2 to AOSP main" into mainHEADmastermainXin Li
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: Ie7e372485e866ec1fd973038ffe0479a3e1ed253 Change-Id: Ic3e5c1fe5dd79676c8811515db77e784ef35973a
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I99b24c9c20d8aaee3b84b1273eea944c0361a166 Change-Id: Ie7e372485e866ec1fd973038ffe0479a3e1ed253
2023-12-25Merge "Snap for 11253470 from 72cc4897fa7aef52abf41b9a569cf576b866b92e to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-12-25Snap for 11253470 from 72cc4897fa7aef52abf41b9a569cf576b866b92e to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Icb56d4c8e5380e6d1a311b63d4fe140a69e33a52
2023-12-21Merge "List baseline_filename on modules that are implititly using it" into ↵Cole Faust
main am: 72cc4897fa Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2886487 Change-Id: Id2159fc937b2474f4ba2df715b5a67ea6a335e1c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21Merge "List baseline_filename on modules that are implititly using it" into mainCole Faust
2023-12-20List baseline_filename on modules that are implititly using itCole Faust
lintable modules currently pick up files named "lint-baseline.xml" to use as the lint baseline implicitly. This is confusing because you could end up using the baseline files in more modules than intended. Lint also has a feature where it requests you remove unnecessary findings from the baseline file, so something could be necessary for one module, but unnecessary for another that accidentally picked up the baseline. We're removing the implicit detection of the baseline file, which requires all modules using it to list the baseline file explicitly. Bug: 272769514 Test: Presubmits Change-Id: I34c7d73667d2868555d4d29f80f17f07900c5337
2023-12-14Merge "Snap for 11217755 from aaac2b7a9449db65bcf5108d4e4b878d0ecb8f49 to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-12-14Snap for 11217755 from aaac2b7a9449db65bcf5108d4e4b878d0ecb8f49 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ic5976adb15a2c107a6e13650c30d54a935e1027f
2023-12-14Merge "Fix Kotlin safety build error" into main am: aaac2b7a94 am: ↵Treehugger Robot
019284b53e am: e328fcd8cf Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2857005 Change-Id: Iba4dc93ae55f8ab2f739713a261dc7e3296339d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Fix Kotlin safety build error" into main am: aaac2b7a94 am: 019284b53eTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2857005 Change-Id: I4ee468876efc016301dfe6b99709afa74eef0e50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "Fix Kotlin safety build error" into main am: aaac2b7a94Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2857005 Change-Id: I8c6dccaa9452c0e774131ef9561cd2d2e7ee06ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13Merge "Fix Kotlin safety build error" into mainTreehugger Robot
2023-12-13Fix Kotlin safety build errorbianfang.guo
Handle nullable in kotlin to avoid build error. Bug: 314709820 Change-Id: I05b2824e3a5e4ec0dfe79d7c91fdfe8700ec1516
2023-12-13Merge "Snap for 11211409 from 5a9598a4f7b6df117b1a839c03b8e04937cc9212 to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-12-13Snap for 11211409 from 5a9598a4f7b6df117b1a839c03b8e04937cc9212 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Ic9ca644ac5aa318ff1192b4daf6608e76ac8a8fc
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 5a9598a4f7 ↵Xin Li
-s ours am: f1d2ffa2db -s ours am: 6f6f0eb66c -s ours am skip reason: Merged-In Ia80a363ce47f7b0143484b3407f3fe55523b578f with SHA-1 335fc61e44 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2866362 Change-Id: I81b4ed3555fe02f56c822535e34323b2003ab9a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 489e9f6ca1 -s ours am: ↵Xin Li
4f9e1af522 -s ours am: 45b880a4aa -s ours am skip reason: Merged-In Ia80a363ce47f7b0143484b3407f3fe55523b578f with SHA-1 335fc61e44 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2866362 Change-Id: Ic08d5885eb98514416eff5eca5bc2acff6d5af0b 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: 5a9598a4f7 ↵Xin Li
-s ours am: f1d2ffa2db -s ours am skip reason: Merged-In Ia80a363ce47f7b0143484b3407f3fe55523b578f with SHA-1 335fc61e44 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2866362 Change-Id: Ic1207c2ec43441d87a6dc9c33428cd64a28fc145 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 489e9f6ca1 -s ours am: ↵Xin Li
4f9e1af522 -s ours am skip reason: Merged-In Ia80a363ce47f7b0143484b3407f3fe55523b578f with SHA-1 335fc61e44 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2866362 Change-Id: Ied5496a8468a5d1e1dbac3027d67d4f74d5881cc 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: 5a9598a4f7 ↵Xin Li
-s ours am skip reason: Merged-In Ia80a363ce47f7b0143484b3407f3fe55523b578f with SHA-1 335fc61e44 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2866362 Change-Id: Ibb9ba944d03770c00fafe0cf2b2e61f00b5e08b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 489e9f6ca1 -s oursXin Li
am skip reason: Merged-In Ia80a363ce47f7b0143484b3407f3fe55523b578f with SHA-1 335fc61e44 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2866362 Change-Id: I2583487a87dbd27814fa9a6b484579c447273855 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: Ia80a363ce47f7b0143484b3407f3fe55523b578f Bug: 315507370 Change-Id: I1259d6fc67054c630dfd5821fe346b922652b98d
2023-11-30[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1772166c01 -s ours am: 335b8f91f8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/25510896 Change-Id: I6f392140657ba9af01bb321d17501dcc9f4c1aa5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
1772166c01 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/25510896 Change-Id: I9bc9015c429cb27e1682762ffab1c7d462a5d7e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
2bcd99cb7e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/25510894 Change-Id: I189badd364f215c5947032f98e179d981e960ddb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I99b24c9c20d8aaee3b84b1273eea944c0361a166
2023-11-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia39dc36b5721395a62c9f6205834088af64e5259
2023-11-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7fc9f1920c2177d8bca5f08746b49b65308706c1
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
82a094203e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/25374206 Change-Id: Ib2122472a505562ca84485677ee8ffbb7c6506dc 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: Ia13f8f5a35eee80dbf87b822392301463b64cd78
2023-11-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7e17d36107dddcaf78c141435f766e3fe8eaa101
2023-11-14[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
707d5f7826 -s ours am: 38fd028515 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/25360673 Change-Id: Iac9ae872ea83fa38705f51ee669331173b939542 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
707d5f7826 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/25360673 Change-Id: Id1382af86b8d334e282dec0560d5426a0c5a8eee Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia5b46bd02a20030e42353a36156af3eb0a5504ef
2023-11-06[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
26abb9e1cf -s ours am: ddc1ffa9ba -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/25276618 Change-Id: If90013740717c556d226042639a8649b68830005 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
26abb9e1cf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/25276618 Change-Id: I5b569d20345f9272a109d87232e011affe1a4f3b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06Merge "Import translations. DO NOT MERGE ANYWHERE" into mainBill Yi
2023-11-06[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
23f86cd1f0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/25276639 Change-Id: I3d67ef303b1659472458873b85789a0790b22b1a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I6cb5d8fa0890ca9b3c645b566d1a74a92db0e176
2023-11-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id653175a149f7add1f1c2d248b0c60535bf9ceda
2023-11-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I90081ca64eca13c74ed6c7c36849b53bfc5e4f5a
2023-10-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c2708cc44e -s ours am: 1e0543577c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/25224939 Change-Id: Ie2033564f3a02efa540278f70d77b62a6eab08b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
c2708cc44e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/25224939 Change-Id: I472ee5021c422c2d40f935ae79d95e881a518ce9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
42d2373d68 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/25224938 Change-Id: Icdb2a525ee81aeba100916d946b7d9d9941b80e0 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-18 09:45:52 +0000