summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-08-08 03:05:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-08 03:05:50 +0000
commit7bdf7eb2b0f360ad24b1bf1c777024ffd52a2b4d (patch)
tree88d43b4fcdd60404bcdd70214c9bb8e534846a12 /libs/androidfw/AttributeResolution.cpp
parent4acb8741c3344cf2ea7be0066465bd08dbb8179e (diff)
parent177c0705e21170b2471e8d5564124876c9517afd (diff)
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: a7ea34724f -s ours am: a242d36b8c -s ours am: 571f185a5a -s ours am: 177c0705e2 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600 Change-Id: Ifa9d7c7e032ac7a28ed739bbb3924d0b708d4961 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