summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Joe Bolinger <jbolinger@google.com> 2022-04-22 23:43:45 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-04-22 23:43:45 +0000
commit110c9b4c1ee76b794fab87e6a3e0b342ca1e0fdd (patch)
tree7553541f852a950fcbd3d68c6290bdb03c16714c /libs/androidfw/StringPool.cpp
parenta7f9adbc944a6c6d960992dba8926e763505b5e5 (diff)
parenta3744e1b2c04d0dbad31f84e842585dcb281bc73 (diff)
Merge changes from topic "cve-fp-sc-v2-dev-sc-qpr1-dev-sc-dev" into sc-mainline-prod
* changes: [automerge] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. 2p: ac89f8682f [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService.
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions