| commit | 6b25ef9fef4cde4eae1d47794cab3dd1bb43102a | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:04:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:04:34 2023 +0000 |
| tree | 12cc34b65360a7c7b8305fc81d64ca7f3e1a3ec3 | |
| parent | 4876714be32f1b272c92842d39db3e1f5fc5fa58 [diff] | |
| parent | 61bc051bfb3c0bc0dc4fd17725ada61b268f08f8 [diff] |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 30d1770dbf -s ours am: b316efb721 -s ours am: 61bc051bfb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301239 Change-Id: I5f642ebfb7148346bb32d98a6b59dda850213542 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>