[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

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: I8aba9955f387a307f6d8008660d45cc21ed7fa66
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:37:24 +00:00

committed by Automerger Merge Worker

parent fe28a5d336 b7af8b41fd

commit e39b390b82

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