[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: a4a3f61406 -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: Ifff0f5b649823ecbbda0287c5add42e6bb872b9e
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:31:39 +00:00

committed by Automerger Merge Worker

parent a194d55ec2 a4a3f61406

commit fbc04b163d

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