| commit | 7a80a00710bfb3efa79a1815e8c1eefb270ada36 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:27:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:27:46 2023 +0000 |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 | |
| parent | 8ef7e76d4ece2becf75a2521b11ceee5f70bd1d3 [diff] | |
| parent | 2afb3fc4cf659977b03915c119c3ad51849cecc7 [diff] |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 976fd54a43 -s ours am: 4306517b07 -s ours am: 6b6765b146 -s ours am: 96aa5fc183 -s ours am: 2fcfc9439a -s ours am: 2afb3fc4cf -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602 Change-Id: I780f69f16de4fad6703724521086847c4e5c22d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>