| commit | 986a34d19cb2053b67e9b85495547c3fcc989ae5 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:59:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:59:37 2021 +0000 |
| tree | 8aab5655821681e7318ce519e9f5e7dec012e3b5 | |
| parent | c6bfaa45a073ec96aa6f0ca81df507dc88d20c20 [diff] | |
| parent | a3fbeb8e35a5e2808c0330c6e424808f39b3f08a [diff] |
[automerger skipped] Merge "Merge Android 12" am: 7c376deb24 -s ours am: a9ba8deb4e -s ours am: b207469245 -s ours am: 619bb99665 -s ours am: a3fbeb8e35 -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: I6359437bd6f3d7384afb1703820a480583609a29