diff options
| author | 2022-04-23 00:42:44 +0000 | |
|---|---|---|
| committer | 2022-04-23 00:42:44 +0000 | |
| commit | cf79a3335d360ca796447f87402750c9ed54d395 (patch) | |
| tree | 858e0ee2d9d77b3896dfc7bb58d681bc0adaa4d3 /libs/androidfw/StringPool.cpp | |
| parent | de4ca763c6dc4d87226ec7ca0a96d8255b5af8f0 (diff) | |
| parent | 67c38a0f5ee486da26164fc0915c34b308cfcaa1 (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: 67c38a0f5e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662
Change-Id: I068e6516e29377019523cf47159f427b70f50307
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