| commit | a3c97f9945ebc1846d53102f79c09cb266c58705 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 02:23:26 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 02:23:26 2023 +0000 |
| tree | 88d43b4fcdd60404bcdd70214c9bb8e534846a12 | |
| parent | 67f3e8b1f8ac0247c6358f0582afb2ee9908febd [diff] | |
| parent | c731ba0701cccfd5be314f04fbd41d94c3befbfc [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-dev am: 65b97b1586 am: c731ba0701 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301063 Change-Id: I3aa1f3fc15bbc5e83a4460091009bf4ed5484972 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>