diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-05-11 18:58:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-11 18:58:51 +0000 |
commit | cf57f5df73fbd81dd43ffa0a4e5b81354775b17e (patch) | |
tree | b24321ac17884be632351c22f458e3f75ece2aa2 | |
parent | b4379a76f137d0aef79173a4e7c3aaae7a22fb1b (diff) | |
parent | e8681069a8f59c350316319a48b1efcc119eb552 (diff) | |
download | ims-android12L-d2-s1-release.tar.gz |
[automerger skipped] Merge "Revert "Use TelephonyManager#isEmergencyNumber() instead"" am: a281046577 am: d2eb366490 am: cef53cebae -s ours am: e8681069a8 -s oursandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-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: Id105a0ac7ea9ddce06243393e5e53813be06125c
0 files changed, 0 insertions, 0 deletions