summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Joe Bolinger <jbolinger@google.com> 2022-04-23 00:42:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-23 00:42:09 +0000
commit4a5f22611a9d18243db349477b896fd86abfdefc (patch)
treec35e2183089ebfff11569aaa5e2553bf9dc49c40 /libs/androidfw/StringPool.cpp
parent67c38a0f5ee486da26164fc0915c34b308cfcaa1 (diff)
parent1cf3ad5fc4081bbf3279cb85af40f210b4c12e54 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650036 Change-Id: I267ddc0334fd2628e0da7e50eba6e49dab414a53 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