| commit | 8f0a0f761c975648a66da433abab45cf006157da | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 02:27:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 02:27:02 2023 +0000 |
| tree | 88d43b4fcdd60404bcdd70214c9bb8e534846a12 | |
| parent | c0a5820b50ed7e6db2ff3ed58096f7b058d665dc [diff] | |
| parent | 00bf4456c3234c3ad55fab4d3bbf0723f5827e5f [diff] |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 976fd54a43 -s ours am: 4306517b07 -s ours am: 6b6765b146 -s ours am: 00bf4456c3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602 Change-Id: Iea5ecf59d318acc2468745a3e0defb426a979860 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>