summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-08-08 03:46:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-08 03:46:27 +0000
commitb7af8b41fd72fad0cbc72117f2ef9c00b3934bff (patch)
treea90e4cf5dd41c1e703b48306c317851ccbf9d468
parentc680209d34d73265b8771a0a802daf8db2a6aed8 (diff)
parent6beebebf104297bc296f16ef80b2afbfc9e78587 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-dev am: a3886a3f27 -s ours am: e8b3781508 -s ours am: 0ee52eca70 -s ours am: 6beebebf10 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301239 Change-Id: I5f647c7376e9528cf6e6df9ae2906edabfead5e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions