summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Joe Bolinger <jbolinger@google.com> 2022-04-23 00:16:25 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-23 00:16:25 +0000
commitc0d3a87af0e7963e9679060c3b48a3388f2d0337 (patch)
treeffb73888ae8054098a69c99ad2bdca2888027c6d /libs/androidfw/AttributeResolution.cpp
parent1cf3ad5fc4081bbf3279cb85af40f210b4c12e54 (diff)
parent5cdb1689bb5dcf2b27fb6f68a17e2ef1cc201e6a (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650036 Change-Id: I54bf0eb100644ef2c8af8736fe8c0729e5b9c8e1 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