diff options
| author | 2022-04-23 00:17:33 +0000 | |
|---|---|---|
| committer | 2022-04-23 00:17:33 +0000 | |
| commit | 67c38a0f5ee486da26164fc0915c34b308cfcaa1 (patch) | |
| tree | c35e2183089ebfff11569aaa5e2553bf9dc49c40 /libs/androidfw/StringPool.cpp | |
| parent | 7f4a849c988bb27f52056374ce6a077a221b611d (diff) | |
| parent | 2f91e4e8d500d2c0091018078ee10f6d27ac7943 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811b2 am: 2f91e4e8d5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662
Change-Id: I5dd754d634a70f29de88d2ae348b474eda848735
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