| commit | c680209d34d73265b8771a0a802daf8db2a6aed8 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:46:20 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:46:20 2023 +0000 |
| tree | a90e4cf5dd41c1e703b48306c317851ccbf9d468 | |
| parent | 53c0fc53a3a8e9fa07f58979af6270f241c344e0 [diff] | |
| parent | 6b25ef9fef4cde4eae1d47794cab3dd1bb43102a [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: 6b25ef9fef -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301239 Change-Id: Ibb0bfc0fc64a7c15956080b664f5800368039e7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>