Skip to content
Commit 98921ea2 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-dev am: c1aa2bb3 -s ours am: 26068ce8 -s ours am: 4d517b48 -s ours am: b1e88e3d -s ours am: 34cb892a -s ours am: 08f1a5c8 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I08c8639b1ff5d3cb5a76bb32565b213f99c99a31
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a2f4bceb 08f1a5c8
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