| commit | 5fb29c4987262b85f1eefb10d195ad97753d9793 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:54:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:54:38 2023 +0000 |
| tree | d72875ddd02a38f67dcb3d4629ea01f1ba7eb2c8 | |
| parent | 463bceae6cf1303cca0d24abee867f1e9053cbf6 [diff] | |
| parent | 7a80a00710bfb3efa79a1815e8c1eefb270ada36 [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: 7a80a00710 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602 Change-Id: Ifb7113d4249a89821a8c03a7eedd70ca99bbf2ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>