| commit | a194d55ec212f85be010c7740ab950e9a4c70e5f | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 04:31:19 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 04:31:19 2023 +0000 |
| tree | 4cb7fba5e37a583620a447a28828ac54e58e632a | |
| parent | 8e84da7427ff664a40d2ca86ed42c21fd3218b30 [diff] | |
| parent | 682110eba0265629c9b3716eac189ff32d08f8ee [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: 682110eba0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301239 Change-Id: Ie952f2e10edb85073d479d7f4d1fa9e127755528 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>