Skip to content
Commit affb156d authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude... 

[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c2 -s ours am: 3b8290a8 -s ours am: 7d29675e -s ours am: e7ef06df -s ours am: a0dc510a -s ours

am skip reason: subject contains skip directive

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



Change-Id: I50504bb1ca4dc326a95b76e41e9f6a09b6d98465
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 324233db a0dc510a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment