summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Vaibhav Devmurari <vdevmurari@google.com> 2025-01-08 10:45:00 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-08 10:45:00 -0800
commit9478999b3a883c89415b78fd2d5e5e522d252a6a (patch)
treea5396111403958b987c9d8de8e3a4412213ed8d1 /libs/androidfw/AttributeResolution.cpp
parent405022c61f185674bb7bff3b34f1f19f4e5f58d1 (diff)
parentb387868584ebef6b3006108fb075775862df1683 (diff)
[automerger skipped] Merge "Fix: Block opening settings app on keyguard without user auth" into udc-qpr-dev am: b387868584 -s ours
am skip reason: Merged-In I89d43872108710d20e0c4ef7e652d389896155d7 with SHA-1 d615298466 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/30865696 Change-Id: I26b2a0e61b522a92a29a9b24e2e17054f37c6c31 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