| commit | 682110eba0265629c9b3716eac189ff32d08f8ee | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:48:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:48:37 2023 +0000 |
| tree | 61792c7b44719985996c805a1d5a440d56710ed7 | |
| parent | 7622520b190283f76cd030fdf7699da8d1810c27 [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: Ie6a87eecf19b0cedf7a2a7a8d0ac37d8bccd7f3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>