summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
8 daysMerge "Snap for 11987826 from a4058db8c697d0b082631465bc5feb1bb13d9ed4 to ↵sdk-releaseAndroid Build Coastguard Worker
sdk-release" into sdk-release
8 daysSnap for 11987826 from a4058db8c697d0b082631465bc5feb1bb13d9ed4 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I4c4bcedf4b7b48677f71b883ff17f4123985e920
9 daysMerge "Merge Android 14 QPR3 to AOSP main" into mainHEADmastermainXin Li
13 daysMerge Android 14 QPR3 to AOSP mainXin Li
Bug: 346855327 Merged-In: Ic83a8f2d1010a198205f099a811357ea523583a4 Change-Id: Id6a5591c53f2bd07027f6c58c39d525afc0ccb57
2024-05-28Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-futuretmp_amf_24Q2Xin Li
Bug: 343100748 Merged-In: Iea653c38c266308b475689f080fd2342618085cb Change-Id: Ic83a8f2d1010a198205f099a811357ea523583a4
2024-04-29Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-futureXin Li
Bug: 337098550 Merged-In: I2fa9dceb89d6a5641b18d6a15a9e160405db8f05 Change-Id: Iced8d255ff5105dfab0ae1b989e1acfb03afe562
2024-03-29Merge cherrypicks of ['googleplex-android-review.googlesource.com/26717940'] ↵android-14.0.0_r51android-14.0.0_r50android14-qpr3-releaseAndroid Build Coastguard Worker
into 24Q2-release. Change-Id: If341f0bc07ad7f2e9fdc010c717fd10540c49a47
2024-03-29Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Bug: 328603775 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e5afa27f8c7907a80d57a82927f6c4ccdf4af660) Merged-In: I1510522f64ad991ea4281d4cf438953ed11ee973 Change-Id: I1510522f64ad991ea4281d4cf438953ed11ee973
2024-03-12Merge "Snap for 11566117 from 5921ff71b4f6da70d996ac8308ba917aaef699bd to ↵platform-tools-35.0.1Android Build Coastguard Worker
sdk-release" into sdk-release
2024-03-12Snap for 11566117 from 5921ff71b4f6da70d996ac8308ba917aaef699bd to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I062bd3ad0a4914c4a62a4a8cb699751b98aa11c4
2024-03-07[automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main ↵Xin Li
am: 5921ff71b4 -s ours am skip reason: Merged-In I5d659dd4c2b98263d90619e04aa4da7d751fbb2f with SHA-1 d2568d7d13 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2990899 Change-Id: I1f0b4de2fcb88227eb28cf706921211cf0013c79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07[automerger skipped] Merge Android 14 QPR2 to AOSP main am: b7d170db36 -s oursXin Li
am skip reason: Merged-In I5d659dd4c2b98263d90619e04aa4da7d751fbb2f with SHA-1 d2568d7d13 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2990899 Change-Id: I7ba466e4a134e232f628152122e4f6e84437b415 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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: I5d659dd4c2b98263d90619e04aa4da7d751fbb2f Change-Id: I74a169d4a181f20623bbfaafeab3c1f61e43a590
2024-02-01Snap for 11386701 from 20db1e5c5a6a8d53cb451f153ab4981ec15aff9d to 24Q2-releaseAndroid Build Coastguard Worker
Change-Id: Ia1b52354ed174c8f1331e2162de14844125af47a
2024-01-31[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: d2568d7d13 ↵Xin Li
-s ours am skip reason: Merged-In I8ca7c51d8cd6531d0b4bb3a96a01c10a145cc606 with SHA-1 07a3109b1b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/25974105 Change-Id: Ieda5889f7baa8a0b3b3d32a193947b83d6286d35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I8ca7c51d8cd6531d0b4bb3a96a01c10a145cc606 Change-Id: I5d659dd4c2b98263d90619e04aa4da7d751fbb2f
2024-01-13Snap for 11308440 from 42467aa0ced178fd4e93844659dea23ab9123bcd to 24Q2-releaseAndroid Build Coastguard Worker
Change-Id: Ibcbaa84f1363be71bfc67127988e1a099b2cbca8
2024-01-12[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
a945783e2b -s ours am: c862e667b1 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/25868534 Change-Id: I2506b5f4fd2d19151b726f560a36d6078a84a1c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
198156b6b3 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/25865312 Change-Id: Ib832571d4353e1fa69e1fe23b0f0669591b62621 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
a945783e2b -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/25868534 Change-Id: I0dbbb93322b8cace98782bd8357b53a4edd73f36 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-11Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2fa9dceb89d6a5641b18d6a15a9e160405db8f05
2024-01-11Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I78d50f357c0d5b8870fd0862f7d42a3c43eecfcf
2024-01-11Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ife25a27c77e7befc832905902ecb4f33f17bfc31
2023-12-16Snap for 11227258 from 005d8edf77aaa549f4451022662ed418edab520c to 24Q2-releaseAndroid Build Coastguard Worker
Change-Id: I6fde22cfdec0963b5ad83d683b6bccc812b79113
2023-12-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
94e7efdbfe -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/25647848 Change-Id: I21d9b27149f67e2e7b762720a10f61ebdeb29167 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
beb9243111 -s ours am: 07ca682390 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/25648203 Change-Id: I6d8e28fd97b260e5f3a73c41f3dbb7c26ecc14e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-15[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
beb9243111 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/25648203 Change-Id: I8eb0a259443b76d1b0c7f48c55187e7e04d3bee1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I3430c2917e6afd57866d775863c1de8e2ad800b6
2023-12-13Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I756183135a1979dd51d8fcdb75dc06879682d87f
2023-12-13Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I40e23a75db8ee968b1bbc7f453795dbff6a66673
2023-12-13Merge "Snap for 11211409 from cdbf57491043563a811113798294d9dc4595389a to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-12-13Snap for 11211409 from cdbf57491043563a811113798294d9dc4595389a to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I8dcd58f929cc67fef99715bb5bf43a6efa3047a2
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: cdbf574910 ↵Xin Li
-s ours am: f9664680ea -s ours am: e6edf5ad74 -s ours am skip reason: Merged-In I72a76d76a583e113add41cad22b9cfcc9e5f5e90 with SHA-1 ea9a38b249 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2866397 Change-Id: I0552a51135cc8a0037659b8ab730226154d4a887 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 470225641f -s ours am: ↵Xin Li
9ceaab40f0 -s ours am: 3cf3305b3d -s ours am skip reason: Merged-In I72a76d76a583e113add41cad22b9cfcc9e5f5e90 with SHA-1 ea9a38b249 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2866397 Change-Id: I85df624d2d86bd2769fc7fbbe46632f6418a7c9d 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: cdbf574910 ↵Xin Li
-s ours am: f9664680ea -s ours am skip reason: Merged-In I72a76d76a583e113add41cad22b9cfcc9e5f5e90 with SHA-1 ea9a38b249 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2866397 Change-Id: Iec1119f62039d27f1b14ac67919cd2a864b0a9a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 470225641f -s ours am: ↵Xin Li
9ceaab40f0 -s ours am skip reason: Merged-In I72a76d76a583e113add41cad22b9cfcc9e5f5e90 with SHA-1 ea9a38b249 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2866397 Change-Id: Id6032726063907097f305c950c7c83b53c036a2c 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: cdbf574910 ↵Xin Li
-s ours am skip reason: Merged-In I72a76d76a583e113add41cad22b9cfcc9e5f5e90 with SHA-1 ea9a38b249 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2866397 Change-Id: I441fc47bcc2fe1c5948f1e9c586e264cb176977d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 470225641f -s oursXin Li
am skip reason: Merged-In I72a76d76a583e113add41cad22b9cfcc9e5f5e90 with SHA-1 ea9a38b249 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2866397 Change-Id: Ifb6c8d26842a1ad37dfed8d0bf57f8c8967d9468 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: I72a76d76a583e113add41cad22b9cfcc9e5f5e90 Bug: 315507370 Change-Id: Ib0907c6e77588ddc0700488a26b5247d4d03f55b
2023-10-19[automerger skipped] Merge 10952656 am: ea9a38b249 -s ours am: e858bff587 -s ↵Xin Li
ours am skip reason: Merged-In Ie5caa1b4d29923504bf2783909ae8d83f3265933 with SHA-1 d9ef5346f6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/25091725 Change-Id: I3da455920dd7964763f76cc64fc65e9f9a381bd3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19[automerger skipped] Merge 10952656 am: ea9a38b249 -s oursXin Li
am skip reason: Merged-In Ie5caa1b4d29923504bf2783909ae8d83f3265933 with SHA-1 d9ef5346f6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/25091725 Change-Id: I5be930721e0cfd9703e185ca0d8d8406a4737052 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-17Merge 10952656tmp_amf_315507370Xin Li
Merged-In: Ie5caa1b4d29923504bf2783909ae8d83f3265933 Change-Id: I72a76d76a583e113add41cad22b9cfcc9e5f5e90
2023-10-11Merge "Snap for 10929834 from 988ac3805542b1c8a1bc20ff3afbbe80c0c2c1df to ↵Android Build Coastguard Worker
sdk-release" into sdk-release
2023-10-10Snap for 10929834 from 988ac3805542b1c8a1bc20ff3afbbe80c0c2c1df to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I9c442f461071ecf78eb5539a7855b5a6fafce9bf
2023-08-31[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
988ac38055 -s ours am: 19fe654b3e -s ours am: 2152e3e20e -s ours am: d9ef5346f6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/24613046 Change-Id: I9b7d9b2bbc85b5ea73648e3cd9b606943d1b069e 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
988ac38055 -s ours am: 19fe654b3e -s ours am: 2152e3e20e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/24613046 Change-Id: Ie5caa1b4d29923504bf2783909ae8d83f3265933 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
988ac38055 -s ours am: 19fe654b3e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/24613046 Change-Id: Id6783e704caa8d7d8f2c1b32bcabd8ae06425e56 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
988ac38055 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/24613046 Change-Id: If228b596be8cd483ebe25bdcfb00dc5a67b77e43 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-06-26 12:45:10 +0000