[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-dev am: a3886a3f27 -s ours am: e8b3781508 -s ours am: 0ee52eca70 -s ours am: 6beebebf10 -s ours am: b7af8b41fd -s ours am: e39b390b82 -s ours am: 29d509a9d5 -s ours

Browse Source

am skip reason: subject contains skip directive

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

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

...

This commit is contained in:

Eric Biggers

2023-08-08 05:23:14 +00:00

committed by Automerger Merge Worker

parent a742772807 29d509a9d5

commit d8dbc6f22c

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