[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-v2-dev am: d57db27a1f -s ours am: a1797b3310 -s ours am: d21ca32265 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600

Change-Id: Iba894908b1d0d3b9703d7bfc72742a5b9d43e0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2023-08-08 02:26:11 +00:00
committed by Automerger Merge Worker

Diff Content Not Available