[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into udc-dev am: d990e73b86 -s ours am: 62510b66e2 -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/+/24300598

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

...

This commit is contained in:

Eric Biggers

2023-08-08 05:22:19 +00:00

committed by Automerger Merge Worker

parent 9a551a83ce 62510b66e2

commit b176861ffa

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