diff options
| author | 2022-04-25 18:17:42 +0000 | |
|---|---|---|
| committer | 2022-04-25 18:17:42 +0000 | |
| commit | d38f05b58f76dade49af6797422641cfa5cba8c2 (patch) | |
| tree | 40a54370ec98d7f334bba893c819ee44dbd5f206 /libs/androidfw/StringPool.cpp | |
| parent | 66270fcd48f5bbd30d87db87be94ed0a68627e9c (diff) | |
| parent | 00a442d67a3db91b12e53ee6b9f99da9d9a6d236 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811b2 am: c53247615d -s ours am: 00a442d67a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662
Change-Id: Ieb4192b6b11fdc8c88e61ac9ccc1d766aaf9fc20
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