[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: c680209d34 -s ours am: fe28a5d336 -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: Id36ead0399c2a5350791a80af7da8f955f14a997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Eric Biggers

2023-08-08 04:53:44 +00:00

committed by Automerger Merge Worker

parent 62510b66e2 fe28a5d336

commit 160e2e2f27

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available