aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-04-13Merge "Remove migrateFromLegacyTables()" am: 0a9fbf4046 am: daac31af1d am: ↵Treehugger Robot
0d692362f5 Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2480578 Change-Id: I6f9cf252009c3d4deec1909a068c93dd2ff78c7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "Remove migrateFromLegacyTables()" am: 0a9fbf4046 am: daac31af1dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2480578 Change-Id: I6301e0bfdfe2c4d3c4f85d7204a8e21b014a5f98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "Remove migrateFromLegacyTables()" am: 0a9fbf4046Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2480578 Change-Id: I206e77790cc9680e0aa323b5b5ae0305b9742640 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-13Merge "Remove migrateFromLegacyTables()"Treehugger Robot
2023-04-13Remove migrateFromLegacyTables()Sebastian Achim
migrateFromLegacyTables can be called from a device encrypted storage context which wrongfully creates contacts2.db under DE storage. The migrateFromLegacyTables() call was only needed to migrate call log from pre-N devices, not needed now, so remove it. Also removed related testMigration test that was added to test migrateFromLegacyTables. Test: atest ContactsProviderTests Bug: 268590477 Change-Id: I84767284669f2342fb018a9ebee78a40c32b923d
2023-04-07[automerger skipped] Revert "Adding a fix for trimming any large fields ↵Kunal Malhotra
before they are inserted into" am: e374a4bed8 am: 423ccc879b -s ours am: 1ed769fc4d -s ours am: f5b6812ab5 -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 4480a86810 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428826 Change-Id: Iade990c7adc91c0c96538adf6c9bdb9645c4c857 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07[automerger skipped] Revert "Adding a fix for trimming any large fields ↵Kunal Malhotra
before they are inserted into" am: e374a4bed8 am: 423ccc879b -s ours am: 1ed769fc4d -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 4480a86810 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428826 Change-Id: Ib8f6ca27f9626d8e3d71d09fa11f64ac941cec8b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07[automerger skipped] Revert "Adding a fix for trimming any large fields ↵android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseKunal Malhotra
before they are inserted into" am: e374a4bed8 am: 423ccc879b -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 4480a86810 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470318 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428826 Change-Id: I664bda68c8d770cb213f80d601c29c0079a3c1f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07[automerger skipped] Revert "Adding a fix for trimming any large fields ↵Kunal Malhotra
before they are inserted into" am: e374a4bed8 am: b6e61db922 -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 4480a86810 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470318 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428826 Change-Id: Ie9d648b264f156ad6d11513edabd61b37db343e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07Revert "Adding a fix for trimming any large fields before they are inserted ↵Kunal Malhotra
into" am: e374a4bed8 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428826 Change-Id: Ida8013adcfd2b03b53f7b3cba2c0f5306335be5f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07Revert "Adding a fix for trimming any large fields before they are inserted ↵Kunal Malhotra
into" am: e374a4bed8 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428826 Change-Id: I4155170c900206800dc6620e462dad768041d957 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[automerger skipped] Merge "Revert "Adding a fix for trimming any large ↵TreeHugger Robot
fields before they are inserted into"" into tm-qpr-dev am: 3bbd5591fa -s ours am: 58da88cbac -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 f2c030a0fd is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428823 Change-Id: Ic6295d31ec37cd339a31962f9056477412e0c22d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[automerger skipped] Revert "Adding a fix for trimming any large fields ↵Kunal Malhotra
before they are inserted into" am: cb3af42d29 -s ours am: 2dd5ecfaca -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 f2c030a0fd is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428823 Change-Id: Ifbca0b85cce2cffae84710e53c74b475beec83d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[automerger skipped] Merge "Revert "Adding a fix for trimming any large ↵TreeHugger Robot
fields before they are inserted into"" into tm-qpr-dev am: 3f923e26e3 -s ours am: 5787a4deae -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 f2c030a0fd is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428824 Change-Id: I375f5d594bb64c0b1c808f6a665f42ed6307be9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[automerger skipped] Revert "Adding a fix for trimming any large fields ↵Kunal Malhotra
before they are inserted into" am: 5f2fd10024 -s ours am: 5275703de9 -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 f2c030a0fd is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428824 Change-Id: Id3ff565062a01d256148500a7ec8c92d9ade93c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[automerger skipped] Adding a fix for trimming any large fields before they ↵Kunal Malhotra
are inserted into am: f2c030a0fd am: 315ecf82f0 -s ours am: 92890b4d5d -s ours am: fdea8a0fce -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 4480a86810 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470318 Change-Id: Ib654df7a690b2bb963f856bd710697b6190f9007 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[manual merge] Adding a fix for trimming any large fields before they are ↵Brian Egizi
inserted into --ours am: 12b34b342f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22485793 Change-Id: I0a6f8311d3ebef20cec795d7b7e6df2c189fca94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[automerger skipped] Merge "Revert "Adding a fix for trimming any large ↵TreeHugger Robot
fields before they are inserted into"" into tm-qpr-dev am: 3bbd5591fa -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 f2c030a0fd is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470320 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428823 Change-Id: I53eb0f56c080e8c389c6176e8cdafbf21b62ddbc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[automerger skipped] Revert "Adding a fix for trimming any large fields ↵Kunal Malhotra
before they are inserted into" am: cb3af42d29 -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 f2c030a0fd is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470320 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428823 Change-Id: Ifdd53b2ed6a860487a1faf9fd344f3ec4eada709 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[automerger skipped] Merge "Revert "Adding a fix for trimming any large ↵TreeHugger Robot
fields before they are inserted into"" into tm-qpr-dev am: 3f923e26e3 -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 f2c030a0fd is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470321 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428824 Change-Id: Ib0ad84927d3fbbb9071ac9dcbff332bc5494d6c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[automerger skipped] Revert "Adding a fix for trimming any large fields ↵Kunal Malhotra
before they are inserted into" am: 5f2fd10024 -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 f2c030a0fd is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470321 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22428824 Change-Id: I4fad1c4554a3a15304125e5fac3c7d66a2bbdfc3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[automerger skipped] Adding a fix for trimming any large fields before they ↵Kunal Malhotra
are inserted into am: f2c030a0fd am: 315ecf82f0 -s ours am: 92890b4d5d -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 4480a86810 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470318 Change-Id: I8897144b04568601358d367ae530f2951bbfd1e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[manual merge] Adding a fix for trimming any large fields before they are ↵Brian Egizi
inserted into --ours Change-Id: I3a90ae5c7f7cff6194e0b99ac364ca3cae96a768
2023-04-05[manual merge] Adding a fix for trimming any large fields before they are ↵Brian Egizi
inserted into --ours am: 7250c8ff3e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/22478862 Change-Id: Ife9fc16d329e187da7e95df25de1eb6d3e01408b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05[manual merge] Adding a fix for trimming any large fields before they are ↵Brian Egizi
inserted into --ours Change-Id: Icc0e59b9b6d018b1bde3b36088a167c6cd757be7
2023-04-03Merge "Revert "Adding a fix for trimming any large fields before they are ↵TreeHugger Robot
inserted into"" into tm-qpr-dev
2023-04-03Merge "Revert "Adding a fix for trimming any large fields before they are ↵TreeHugger Robot
inserted into"" into tm-qpr-dev
2023-04-03[automerger skipped] Adding a fix for trimming any large fields before they ↵Kunal Malhotra
are inserted into am: f2c030a0fd am: 315ecf82f0 -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 4480a86810 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470318 Change-Id: Ic780deb38af28cbe0df484108d9202bd4f2bf88a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03[automerger skipped] Adding a fix for trimming any large fields before they ↵Kunal Malhotra
are inserted into am: f2c030a0fd am: afaac625b6 -s ours am skip reason: Merged-In I52814fee6c5e137809020f16f332800ef9d79099 with SHA-1 b915bb73ad is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470318 Change-Id: Ida963406cb32a6da9bf8395c2f8ce569a922c887 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Revert "Adding a fix for trimming any large fields before they are inserted ↵Kunal Malhotra
into" This reverts commit f2c030a0fd2e0be9c41d7c6605912c925785d0c3. Reason for revert: Shouldn't be backported Change-Id: Id2f6c05c19c7840ef54b65cd3dc7eccef17e864e
2023-04-03Revert "Adding a fix for trimming any large fields before they are inserted ↵Kunal Malhotra
into" This reverts commit 4480a86810cc73a198fbe967685dd8980b375887. Reason for revert: Change shouldn't be backported Change-Id: I50efa4b0f7f897befef64d159f7de61721c6dad3
2023-04-03Revert "Adding a fix for trimming any large fields before they are inserted ↵Kunal Malhotra
into" This reverts commit ddb6cba69fc41836fda8173dbe259ff6f7e33790. Reason for revert: Shouldn't be backported Change-Id: I6e0d113841a4140c541905b4589bc94d6f0db896
2023-04-03Adding a fix for trimming any large fields before they are inserted into am: ↵Kunal Malhotra
f2c030a0fd Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470318 Change-Id: I6e3198483b60e36cc90b52934f088593ad969982 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Adding a fix for trimming any large fields before they are inserted into am: ↵Kunal Malhotra
f2c030a0fd Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21470318 Change-Id: Ie4412c778a49924a5f82f4579c44bb827d88f790 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Adding a fix for trimming any large fields before they are inserted ↵TreeHugger Robot
into the DB" into tm-qpr-dev
2023-04-03Adding a fix for trimming any large fields before they are inserted intoKunal Malhotra
the DB Test: manual testing done by attempting to add an imported contact with a very large field in it Change-Id: I52814fee6c5e137809020f16f332800ef9d79099 Bug: b/262595156 b/262594744 (cherry picked from commit b915bb73ad6905bf339f5fcf8d47a8f487b0f889) Merged-In: I52814fee6c5e137809020f16f332800ef9d79099
2023-04-03Adding a fix for trimming any large fields before they are inserted intoKunal Malhotra
the DB Test: manual testing done by attempting to add an imported contact with a very large field in it Change-Id: I52814fee6c5e137809020f16f332800ef9d79099 Bug: b/262595156 b/262594744 (cherry picked from commit b915bb73ad6905bf339f5fcf8d47a8f487b0f889) Merged-In: I52814fee6c5e137809020f16f332800ef9d79099
2023-04-03Adding a fix for trimming any large fields before they are inserted intoKunal Malhotra
the DB Test: manual testing done by attempting to add an imported contact with a very large field in it Change-Id: I52814fee6c5e137809020f16f332800ef9d79099 Bug: b/262595156 b/262594744 (cherry picked from commit b915bb73ad6905bf339f5fcf8d47a8f487b0f889) Merged-In: I52814fee6c5e137809020f16f332800ef9d79099
2023-03-18Merge "Restrict contact access to launchable cloned apps" into udc-devJigar Thakkar
2023-03-17Restrict contact access to launchable cloned appsJigar Thakkar
Earlier, we used the cloneable_apps.xml as an allowlist to restrict cloned apps to access cross-profile contacts. This made it difficult to maintain CTS tests for clone contacts provider as the allowlist is empty by default. This change moves the allowlisting logic to use package manager call to identify launchable activities and use them to restrict access to cross-profile contacts. The mLaunchableCloneAppsCache is also added to ensure the results for a package are cached. Since, app uids are used as a key every cache entry, the entries are refreshed after 60s to ensure the uid values are not stale. The cache is also cleaned up once every 7 days to remove outdated entries using additional space (apps that have been removed). Bug: 271752108 Test: atest CloneContactsProvider2Test - added a couple of test case corresponding to the app allowlist check Change-Id: I6af0a69ac0c84a85e6cb39b2d573dec78a050a81 Change-Id: Id7282c9bf9b58fd32cf64cb0842d5e34c9ca2f18
2023-03-15Merge "Correct broadcast action for ContactsProvider2 receiver" into udc-devMichael Groover
2023-03-09Correct broadcast action for ContactsProvider2 receiverMichael Groover
The runtime receiver in ContactsProvider2 was reported as part of a lint check due to registering for a non-system broadcast. The action for which it is registering is expected as an extra in the ACTION_PHONE_ACCOUNT_REGISTERED broadcast; since the receiver in this class has a check for this action, this commit updates the IntentFilter for this receiver to use this broadcast action instead. Bug: 234659204 Test: ContactsProvider2Test Change-Id: I6d3591521243f2932f5b6ef8a0f35ab894bdd331
2023-03-01[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
stage-aosp-master am: a6c2df3af2 -s ours am: 796c6478d9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21605201 Change-Id: I7ca835af579a9e733e26cc21781f7e1b0262fbf3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
111feb2c7e -s ours am: c9cfce24dc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21605201 Change-Id: I0090f781438d51fc663848d8fa52ae20e345e259 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Bill Yi
dc0728749c -s ours am: a0defdd8cb -s ours am: 5e7bba86cf -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2457636 Change-Id: Ic4ba5a6631228e95707c29e9a143afc961e434a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
4e561b3030 -s ours am: d85f01001f -s ours am: b97e9db0f8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2457636 Change-Id: Ic5c29eccf576fecc6c3b91cb52015c6bea33df90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
stage-aosp-master am: a6c2df3af2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21605201 Change-Id: I70de438f8a71b274b7802e5b8048489437a4041c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
111feb2c7e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/21605201 Change-Id: I6d2d65ba750da8fe02a465e4ef4ab3f8e697b12b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Bill Yi
dc0728749c -s ours am: a0defdd8cb -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2457636 Change-Id: Iba44bd63460fc78aeb459617abfdf17b35aae764 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
4e561b3030 -s ours am: d85f01001f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/2457636 Change-Id: I04e958862357f4f8d03ba0833f412842c9324b19 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-07-16 13:18:14 +0000