diff options
| author | 2022-04-25 17:50:24 +0000 | |
|---|---|---|
| committer | 2022-04-25 17:50:24 +0000 | |
| commit | 00a442d67a3db91b12e53ee6b9f99da9d9a6d236 (patch) | |
| tree | b40d1459aee9ea4911b1721436de9d08208106dd /libs/androidfw/StringPool.cpp | |
| parent | 3b8fef3d48881e98a568f4abd6bee3bec8fe5484 (diff) | |
| parent | c53247615d436b563c5956fa8197a5bccf68034b (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662
Change-Id: I0b2c74777bf4bdce8f85e9d1b48f1188d951649b
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