summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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: I5d659dd4c2b98263d90619e04aa4da7d751fbb2f Change-Id: I74a169d4a181f20623bbfaafeab3c1f61e43a590
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I8ca7c51d8cd6531d0b4bb3a96a01c10a145cc606 Change-Id: I5d659dd4c2b98263d90619e04aa4da7d751fbb2f
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-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>
2023-08-30Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Id040f0c6a20dc800bffc139d2eace22cc8e51eb6
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: ea114af46f -s ours ↵Xin Li
am: eb0bb2b709 -s ours am: 8c14b89e62 -s ours am: 356d02ae1b -s ours am skip reason: Merged-In Idfa102e3171cfc24972a72a4ab094e92e494aa9a with SHA-1 f067dc487b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/24182582 Change-Id: I1889c85f4a7ae1a8d41e0a5743d81a5a748f5ae6 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: ea114af46f -s ours ↵Xin Li
am: eb0bb2b709 -s ours am: 8c14b89e62 -s ours am skip reason: Merged-In Idfa102e3171cfc24972a72a4ab094e92e494aa9a with SHA-1 f067dc487b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/24182582 Change-Id: I95adddf48ef06ba8fe79d50a29da7db1dc70c38c 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: ea114af46f -s ours ↵Xin Li
am: eb0bb2b709 -s ours am skip reason: Merged-In Idfa102e3171cfc24972a72a4ab094e92e494aa9a with SHA-1 f067dc487b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/24182582 Change-Id: Iefced64179a3b6d9d4c61646b1dc9f9d5609c172 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: ea114af46f -s oursXin Li
am skip reason: Merged-In Idfa102e3171cfc24972a72a4ab094e92e494aa9a with SHA-1 f067dc487b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/24182582 Change-Id: I6f39532134f8dd6b1ff50d80bebfa33a905fd45e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: Idfa102e3171cfc24972a72a4ab094e92e494aa9a Change-Id: I572666b74dc2d4cecc4e356560c81d715ba21524
2023-06-09[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ab9cf25521 -s ours am: 8d3c4cd4f6 -s ours am: 36d4f0ae55 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/23383502 Change-Id: I0cc5076abe0568ce53cb580546ac91d5b3db14b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Bill Yi
udc-dev am: 1d76bfdc32 -s ours am: 494af9157b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/23383503 Change-Id: If3073012541c61284a59bf735b19acd6a773aaa2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
2dcf6f841c -s ours am: 701d83bcbb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/23383503 Change-Id: I030f869e58cc05daf80a7aed0dfb81c02ba22f51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
05c33a4f3a -s ours am: 1dc6e44798 -s ours am: 2be08851a0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/23383505 Change-Id: I4677b009fd5271a851a9f12832cf0a3ff38a2e72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
b84be16341 -s ours am: 2f3800e3b7 -s ours am: 5e4f44715e -s ours am: f067dc487b -s ours am: 3d74dae088 -s ours am: 4ee16a67c2 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2614295 Change-Id: I87098a89d31b863ed1328fd7659f95564c34eaae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
e4b58dc5fb -s ours am: 69e88e6bb0 -s ours am: bc6eeca608 -s ours am: ee31f413b7 -s ours am: 3539dd88a7 -s ours am: f77ca5727a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2614295 Change-Id: I5d6b9a391a5e3e21e665cce0822fef28b36b7e5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
b84be16341 -s ours am: 2f3800e3b7 -s ours am: 5e4f44715e -s ours am: f067dc487b -s ours am: 3d74dae088 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2614295 Change-Id: Ieaeed4157772cbc36130e1654b174c27ae88cea1 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
e4b58dc5fb -s ours am: 69e88e6bb0 -s ours am: bc6eeca608 -s ours am: ee31f413b7 -s ours am: 3539dd88a7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2614295 Change-Id: I6e5af13813f4446cb8ef07ebda8004c1b5851e46 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
b84be16341 -s ours am: 2f3800e3b7 -s ours am: 5e4f44715e -s ours am: f067dc487b -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2614295 Change-Id: I55f94ac7fecb23c9db70bab01b10068050ddc538 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
e4b58dc5fb -s ours am: 69e88e6bb0 -s ours am: bc6eeca608 -s ours am: ee31f413b7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2614295 Change-Id: If8b316ce57e61e33a65e9f1a750daf553ab268b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
b84be16341 -s ours am: 2f3800e3b7 -s ours am: 5e4f44715e -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2614295 Change-Id: Idfa102e3171cfc24972a72a4ab094e92e494aa9a 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
e4b58dc5fb -s ours am: 69e88e6bb0 -s ours am: bc6eeca608 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2614295 Change-Id: I1613755e0c445093d7d472323c2edce11c02c5c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
b84be16341 -s ours am: 2f3800e3b7 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2614295 Change-Id: I0954489fcef1b1a465118f8f9653aaf5d4b3cb99 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
e4b58dc5fb -s ours am: 69e88e6bb0 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2614295 Change-Id: I647173094ef706daf3c8fc7247bee19e4dffcd82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
b84be16341 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2614295 Change-Id: I5a6f484244807ac2748654e1ec638d0404036cf0 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
e4b58dc5fb -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/2614295 Change-Id: Id999873f54eaa2defef227f0ae59d5760e866018 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Merge "Import translations. DO NOT MERGE ANYWHERE"Treehugger Robot
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0df3cbe18d -s ours am: 42dead30a6 -s ours am: c8636ddc8d -s ours am: f4f97f2392 -s ours am: 37a7c5d26d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/23556152 Change-Id: I9c6dd9e97b7c40e235380584dee6507eaf5a8bb6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0df3cbe18d -s ours am: 42dead30a6 -s ours am: c8636ddc8d -s ours am: f4f97f2392 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/23556152 Change-Id: Ic28cbe8f2f4161835bb731e61f331ec4157ad2dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0df3cbe18d -s ours am: 42dead30a6 -s ours am: c8636ddc8d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/23556152 Change-Id: I5298bc990acd28df7912993894080dfd6af3c786 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0df3cbe18d -s ours am: 42dead30a6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/23556152 Change-Id: I851b5138cdb461eeabcca9efa58a7623669150e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
0df3cbe18d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/23556152 Change-Id: Ib5b563e43868925c6db432960ed7bcd224c8959b 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: Iecdb5573ac67a5282bd568e6e16ff570ff6ef413
2023-06-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I4952ebf8b0f9a90566d373780ab79e6a80488cbd
2023-05-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ab9cf25521 -s ours am: 8d3c4cd4f6 -s ours am: 063b2ffa49 -s ours am: 5370da07de -s ours am: eb4e5d5de1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/23383502 Change-Id: Id8d912725352da219323d3ae51d61d12207c15a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ab9cf25521 -s ours am: 8d3c4cd4f6 -s ours am: df7cb10e55 -s ours am: af2f17e304 -s ours am: 7ac2455be3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/PhoneCommon/+/23383502 Change-Id: Iac329f79c94588e221a4b3f77a88af0ba54d444b 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 01:30:28 +0000