diff options
| author | 2022-04-23 00:42:32 +0000 | |
|---|---|---|
| committer | 2022-04-23 00:42:32 +0000 | |
| commit | 320c2e6622857f6a4d669f671add5aa2c3af7328 (patch) | |
| tree | c35e2183089ebfff11569aaa5e2553bf9dc49c40 /libs/androidfw/StringPool.cpp | |
| parent | 4a5f22611a9d18243db349477b896fd86abfdefc (diff) | |
| parent | c0d3a87af0e7963e9679060c3b48a3388f2d0337 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-qpr1-dev am: 5cdb1689bb -s ours am: c0d3a87af0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650036
Change-Id: I61d2ef1b560ef711293a66a5148479a437599ba4
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