| commit | 32c0b78c5459724710959cf996ecaba364408298 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:47:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:47:48 2023 +0000 |
| tree | a90e4cf5dd41c1e703b48306c317851ccbf9d468 | |
| parent | 4c47563c9c6e34cf6c3e79144023f518f8c2a69f [diff] | |
| parent | 08f1a5c82f1db0398fb4a865969592f5ffcf49b9 [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: 08f1a5c82f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483 Change-Id: Iecb8298f46bf108d2fabda4440ac71111c67727b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>