summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Joe Bolinger <jbolinger@google.com> 2022-04-23 00:15:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-23 00:15:31 +0000
commit2f91e4e8d500d2c0091018078ee10f6d27ac7943 (patch)
tree7553541f852a950fcbd3d68c6290bdb03c16714c /libs/androidfw/StringPool.cpp
parent110c9b4c1ee76b794fab87e6a3e0b342ca1e0fdd (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: I51a7f516c0ddd3a99b4f906cdaa361e5f1652aec 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