commit | 619bb996654721642c145f2a2e243e3cac53824a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:28 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:28 2021 +0000 |
tree | 93afda455376cb78f862ebfe924d2d4ccd30328c | |
parent | c8eacca3cb8fc55e6230e6e736c8cf9cf392d4ce [diff] | |
parent | b2074692452d82ffc65d5168c4794bc52963a787 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 7c376deb24 -s ours am: a9ba8deb4e -s ours am: b207469245 -s ours am skip reason: Merged-In I8ddbe0c5ee40d4b4cd6190f63cf9339a1d914f2c with SHA-1 44af597715 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1847710 Change-Id: I0f22bb6e4c1f1d48375844861881ad139d6646aa