[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-dev am: 65b97b1586 am: 677b43cbc7 -s ours am: 32cd68e6ea -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: Ice6c8074eecd0e88fe0fb0b145df3bf52f7b50e2
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:03:08 +00:00

committed by Automerger Merge Worker

parent 13cbc11d04 32cd68e6ea

commit 201bb40d90

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