summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Joe Bolinger <jbolinger@google.com> 2022-04-25 17:50:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-25 17:50:10 +0000
commit3b8fef3d48881e98a568f4abd6bee3bec8fe5484 (patch)
treeb40d1459aee9ea4911b1721436de9d08208106dd /libs/androidfw/StringPool.cpp
parentc0bcb303e879ed1ebc193296ceb676083ef50a62 (diff)
parent5410ad42bcd5605da35a32c183fe0f3347385d27 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662 Change-Id: Id36cf5a90a2a4fad6096f827a878669ae0499b34 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