[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-dev am: c1aa2bb360 -s ours am: 26068ce874 -s ours am: 4d517b4865 -s ours am: b1e88e3d2e -s ours am: 34cb892a71 -s ours am: 08f1a5c82f -s ours am: 98921ea24e -s ours

Browse Source

am skip reason: subject contains skip directive

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

Change-Id: Ib38841f97c618e2a083a39e42f9c013f2ae255ca
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:33:52 +00:00

committed by Automerger Merge Worker

parent c939100250 98921ea24e

commit 8384103619

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