diff options
| author | 2022-04-25 18:36:36 +0000 | |
|---|---|---|
| committer | 2022-04-25 18:36:36 +0000 | |
| commit | a6f7b4569e8f793e8b55c46a4b1ee857ba8f8475 (patch) | |
| tree | 84d9411e82619eb2861cc86301af51d77a1e03d7 /libs/androidfw/StringPool.cpp | |
| parent | 311d8030de3701439b66d3bd7e6a8a31e0cd4a0f (diff) | |
| parent | d38f05b58f76dade49af6797422641cfa5cba8c2 (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: d38f05b58f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662
Change-Id: I1e819f54bb7e64c5411d8755b7f047b38f851eef
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