Skip to content
Commit 320c2e66 authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when... 

[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-qpr1-dev am: 5cdb1689 -s ours am: c0d3a87a -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: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a5f2261 c0d3a87a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment