[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 30d1770dbf -s ours am: b316efb721 -s ours am: 61bc051bfb -s ours am: 6b25ef9fef -s ours am: 682110eba0 -s ours am: a194d55ec2 -s ours

am skip reason: subject contains skip directive

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

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

Diff Content Not Available