summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Joe Bolinger <jbolinger@google.com> 2022-04-25 18:35:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-25 18:35:30 +0000
commit47d237141baa789f57e54bd52a67cbc9cd8993f3 (patch)
treecf1b76bf32d46d3c275b2a35d5139b94c5565795 /libs/androidfw/StringPool.cpp
parentc0b5c6cc6014f6e924df45fea9c9d9fe877dcaeb (diff)
parent66270fcd48f5bbd30d87db87be94ed0a68627e9c (diff)
[automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: ac89f8682f -s ours am: 5410ad42bc -s ours am: 3b8fef3d48 -s ours am: 66270fcd48 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662 Change-Id: Ieb9aa8005b3e7f5a55bdcb02da809a282e98f68b 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