| commit | 34cb892a7167f03e178f3bae6a90a064dd8125fb | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 02:22:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 02:22:49 2023 +0000 |
| tree | 243a9ee02ceb28efd86113062fa238c51f7acda6 | |
| parent | a0dc510a49987f172f80dae1a0d49b33af069c21 [diff] | |
| parent | b1e88e3d2e8fe8a0bf5f16970160f0c6ffa6c8a5 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483 Change-Id: I9d8b4ec5dde1b731fb5517b73c596fa6f4a99051 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>