summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-08-08 01:11:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-08 01:11:52 +0000
commit34cc50a45396480f3701831953ab0eff97ed42c1 (patch)
tree243a9ee02ceb28efd86113062fa238c51f7acda6 /libs/androidfw/AttributeResolution.cpp
parent4306517b07d1cda359dde916658331c99348e876 (diff)
parent2028c143ae6d433d0ee5275a0cfbe44b931db3c5 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-qpr1-dev am: 2028c143ae -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602 Change-Id: Id3556258db307dda6a65ce2abd7baec4854f3b03 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