commit | a9ba8deb4e5d45671782eaa3c56e9f4f5940b57a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:19:47 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:19:47 2021 +0000 |
tree | 3fddf8d5072cb27f481b22768580832224109210 | |
parent | 44af5977156b072ce1d67a4209b31875061a14d8 [diff] | |
parent | 7c376deb24af2a6ad28fac211ec9f3bb373bc023 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 7c376deb24 -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: I7b0697465bf8674c8a991b86b95211e799ad55d1