diff options
| author | 2022-04-25 18:35:41 +0000 | |
|---|---|---|
| committer | 2022-04-25 18:35:41 +0000 | |
| commit | fb040be7ef3836f8e6efbd0205fe8167db74ba01 (patch) | |
| tree | cf1b76bf32d46d3c275b2a35d5139b94c5565795 /libs/androidfw/StringPool.cpp | |
| parent | 47d237141baa789f57e54bd52a67cbc9cd8993f3 (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: I995e73c97e55aeb54bc9cdfa18da669de5fa5617
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