summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Joe Bolinger <jbolinger@google.com> 2022-04-25 17:14:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-25 17:14:50 +0000
commitc53247615d436b563c5956fa8197a5bccf68034b (patch)
treec16d56ba0aae23d07421aca4edf883356949bc82 /libs/androidfw/StringPool.cpp
parent5410ad42bcd5605da35a32c183fe0f3347385d27 (diff)
parentc8347811b2b497d30d4572d026eaf3d67fd96c29 (diff)
Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662 Change-Id: I9a9bf3b5f7ccdc1198c012e495cd42c55f51f296 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