summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-01-25 20:10:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-25 20:10:21 +0000
commit113428db7a5fa0c6e9ad87420ccabefea4c02cea (patch)
tree94cf77fe2a0773212f504708bc39b9be028537a0 /libs/androidfw/AttributeResolution.cpp
parent85f472e3e5dde767f37d1fe9dd9aaee965e48110 (diff)
parent6b3e246406840f90d0b53454838bc0d90c729d53 (diff)
[automerger skipped] Merge "isUserInLockDown can be true when there are other strong auth requirements" into tm-qpr-dev am: 339a0d7cab am: a697e288ca am: 6b3e246406 -s ours
am skip reason: Merged-In I5e979a7822dd7254b4579ab28ecf96df1db44179 with SHA-1 d341f1ecdb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25951757 Change-Id: I18a316e044a772323d7b94b4a677e13e8042d546 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