Skip to content
Commit 3029dc01 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 rvc-qpr-dev am: 6ff8b636 -s ours am: 91c3b175 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I26d865255f49eb88a26ef513dfa93e278e4c510e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34de4bb4 91c3b175
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