refs/heads/android12-dev - platform/external/ims

commit: e8681069a8f59c350316319a48b1efcc119eb552
[log]
author: Treehugger Robot <treehugger-gerrit@google.com>
Tue May 11 18:13:28 2021 +0000
committer: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue May 11 18:13:28 2021 +0000
tree: b24321ac17884be632351c22f458e3f75ece2aa2
parent: b4379a76f137d0aef79173a4e7c3aaae7a22fb1b [diff]
parent: cef53cebaec3ba418d94c6bdb013d473ee611d08 [diff]

[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours

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: I2d74562804fb38db1cb6caf87a486f9547b7ab9a

tree: b24321ac17884be632351c22f458e3f75ece2aa2