[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-v2-dev am: d57db27a1f -s ours am: a1797b3310 -s ours am: 7b4b95869e -s ours am: 98f92dd44c -s ours am: 7bdd7c80fd -s ours am: 8ef7e76d4e -s ours

Browse Source

am skip reason: subject contains skip directive

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

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

...

This commit is contained in:

Eric Biggers

2023-08-08 03:54:08 +00:00

committed by Automerger Merge Worker

parent c506dd6fb5 8ef7e76d4e

commit 463bceae6c

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