[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-qpr-dev am: 6ff8b636ee -s ours am: 91c3b175ac -s ours am: 3029dc01e5 -s ours am: ed968a1c43 -s ours am: 324233db2c -s ours am: 91567e9b86 -s ours am: 0aaf5cf83f -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: I3239c60d5fb87572920c67a5148a1a81032138ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Eric Biggers

2023-08-08 04:55:06 +00:00

committed by Automerger Merge Worker

parent e839b9f7ca 0aaf5cf83f

commit 5e3c754e9a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available