| commit | 8ef7e76d4ece2becf75a2521b11ceee5f70bd1d3 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:26:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:26:56 2023 +0000 |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 | |
| parent | fa364fa27de5e331632f3df69e6be2469df42775 [diff] | |
| parent | 7bdd7c80fd7e23bb7dce8552c6ea12ac51396e3d [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-v2-dev am: d57db27a1f -s ours am: a1797b3310 -s ours am: 7b4b95869e -s ours am: 98f92dd44c -s ours am: 7bdd7c80fd -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600 Change-Id: I6fa7c84590427e9f24eb38067a5a423bf6e327e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>