[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-dev am: 65b97b1586 am: c731ba0701 -s ours am: a3c97f9945 -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: I153b53a007cbdef3918932cb60e8a0031514b20e
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:01:50 +00:00

committed by Automerger Merge Worker

parent 84dc14a368 a3c97f9945

commit e14df1a3d0

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