summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Joe Bolinger <jbolinger@google.com> 2022-04-25 18:17:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-25 18:17:21 +0000
commit66270fcd48f5bbd30d87db87be94ed0a68627e9c (patch)
tree40a54370ec98d7f334bba893c819ee44dbd5f206 /libs/androidfw/AttributeResolution.cpp
parentc2c8ac85ea91fed37e655065902e5edd65c0dcf8 (diff)
parent3b8fef3d48881e98a568f4abd6bee3bec8fe5484 (diff)
[automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: ac89f8682f -s ours am: 5410ad42bc -s ours am: 3b8fef3d48 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666662 Change-Id: I12f703171de5876f106984d7cfe2948e9706f6c3 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/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions