| commit | 13cbc11d04f025077e07efc937178bd25c80e52c | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:02:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:02:33 2023 +0000 |
| tree | 88d43b4fcdd60404bcdd70214c9bb8e534846a12 | |
| parent | 1902369c717ff753d3e83f19ea6b9ac5ec07ba6d [diff] | |
| parent | f727511022c9b6ea62e438e406ae15c9a5614ebe [diff] |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 8c2d2c6fc9 am: 5041574a8d -s ours am: f727511022 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301063 Change-Id: I73bc98c3d287bf803a2b46199b4d2209fd053919 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>