summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Shuo Qian <shuoq@google.com> 2020-10-14 18:44:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-10-14 18:44:18 +0000
commitaf6b219d6f3a6a0afb01f9148f70cd62c78bb7b8 (patch)
treebec758a076e38d4d484cc20d58406363e589825b /libs/androidfw/AttributeResolution.cpp
parentb7b1fb544f20c0c3a1663985aaef084eeb33ca27 (diff)
parent4e847577d35345aa430a5b50312b0d524546a4bb (diff)
Merge "Use TelephonyManager#isEmergencyNumber() instead" am: 1963c4b1c6 am: e931ca461e am: 4e847577d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454556 Change-Id: Iaf149e798f39c8bceecb5a50ba2933f46402ba52
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions