Skip to content
Commit 5fb29c49 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: 976fd54a -s ours am: 4306517b -s ours am: 6b6765b1 -s ours am: 96aa5fc1 -s ours am: 2fcfc943 -s ours am: 2afb3fc4 -s ours am: 7a80a007 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ifb7113d4249a89821a8c03a7eedd70ca99bbf2ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 463bceae 7a80a007
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