diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-05-11 18:18:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-11 18:18:29 +0000 |
| commit | b29f3c0303d491e2bebb50ecd48527d87f836aa9 (patch) | |
| tree | b24321ac17884be632351c22f458e3f75ece2aa2 | |
| parent | 2389c17373555e0486a0196a5fff1a5de7475259 (diff) | |
| parent | e8681069a8f59c350316319a48b1efcc119eb552 (diff) | |
| download | ims-b29f3c0303d491e2bebb50ecd48527d87f836aa9.tar.gz | |
[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours am: e8681069a8 -s oursandroid-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
am skip reason: Merged-In I7eca63e80394ed606a61bfc3a60b5f068e6192ca with SHA-1 524867d42f is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/external/ims/+/1453740
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032
Change-Id: Icb06f332cebcf4a85dd5c14db9ea8c003407ea7f
0 files changed, 0 insertions, 0 deletions