[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 5bd6bb45d7 -s ours am: 97b5b9acae -s ours am: 34de4bb468 -s ours am: a1a4bd2336 -s ours am: 09e0cdedda -s ours am: 7b68ff1598 -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: Id4d76718a739107b1ca7a1f34153acfc6c536ef2
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:38:06 +00:00

committed by Automerger Merge Worker

parent e39b390b82 7b68ff1598

commit 63db4c1be2

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