summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-08-08 03:53:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-08 03:53:11 +0000
commitb33de12fbd49d5ace283254c8b40c7c1b936e981 (patch)
treed72875ddd02a38f67dcb3d4629ea01f1ba7eb2c8 /libs/androidfw/AttributeResolution.cpp
parentf733e41b02ff29d0d77056fccb1b52cb588219ff (diff)
parent58e9ce3e948addd94ca3fd66e42fb40e5c7b7437 (diff)
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 8c2d2c6fc9 am: 5041574a8d -s ours am: f727511022 -s ours am: 13cbc11d04 -s ours am: 58e9ce3e94 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301063 Change-Id: If7f243d0a5406fab1cba67ce938176651f07f839 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