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

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

[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-v2-dev am: d57db27a -s ours am: a1797b33 -s ours am: 7b4b9586 -s ours am: 98f92dd4 -s ours

am skip reason: subject contains skip directive

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



Change-Id: If4899b4035803cbd6c0a51ea67ebe9a4fab13f82
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7bdf7eb2 98f92dd4
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