summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Joe Bolinger <jbolinger@google.com> 2022-04-23 00:49:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-23 00:49:55 +0000
commit9333a2ee04bdfa59afadd0a0edbe72c6cb666608 (patch)
tree858e0ee2d9d77b3896dfc7bb58d681bc0adaa4d3 /libs/androidfw/StringPool.cpp
parentcf79a3335d360ca796447f87402750c9ed54d395 (diff)
parent4a5f22611a9d18243db349477b896fd86abfdefc (diff)
[automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: 8175c6a005 -s ours am: 1cf3ad5fc4 -s ours am: 4a5f22611a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650036 Change-Id: I2b9bc654cd632a7aaab501159220024577e734aa Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions