| commit | 08f1a5c82f1db0398fb4a865969592f5ffcf49b9 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:07:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:07:55 2023 +0000 |
| tree | 12cc34b65360a7c7b8305fc81d64ca7f3e1a3ec3 | |
| parent | affb156d85a1df721f9e0db2c199680e50e5989e [diff] | |
| parent | 34cb892a7167f03e178f3bae6a90a064dd8125fb [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-dev am: c1aa2bb360 -s ours am: 26068ce874 -s ours am: 4d517b4865 -s ours am: b1e88e3d2e -s ours am: 34cb892a71 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483 Change-Id: I37e2889c62606cfd1a7634552e5bebaf6b12f1fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>