[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-dev am: a3886a3f27 -s ours

Browse Source

am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 976fd54a43 is already in history

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

Change-Id: I81bc96485ef756bc5dde28863101846aa2b476be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Eric Biggers

2023-08-08 01:32:00 +00:00

committed by Automerger Merge Worker

parent b316efb721 a3886a3f27

commit e8b3781508

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