diff options
| author | 2022-04-23 00:49:56 +0000 | |
|---|---|---|
| committer | 2022-04-23 00:49:56 +0000 | |
| commit | 4121014536faec9d42a53acc7f9064cdf3aa964e (patch) | |
| tree | 858e0ee2d9d77b3896dfc7bb58d681bc0adaa4d3 /libs/androidfw/StringPool.cpp | |
| parent | 9333a2ee04bdfa59afadd0a0edbe72c6cb666608 (diff) | |
| parent | 320c2e6622857f6a4d669f671add5aa2c3af7328 (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: 320c2e6622 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650036
Change-Id: I095b065fab804381c03599659cf8136eafc3b7ab
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