| commit | a1797b3310c8ff22161d1fe67a0f6bf5e3c3ada7 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 01:15:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 01:15:04 2023 +0000 |
| tree | 12cc34b65360a7c7b8305fc81d64ca7f3e1a3ec3 | |
| parent | a242d36b8ce437fc37ad5f5d7ee6c32fdb6ae9f8 [diff] | |
| parent | d57db27a1fe6fcddffdd2bd3193cca82c7f300f2 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-v2-dev am: d57db27a1f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600 Change-Id: I77cbf58baea177eec1ea2d55536a0361b834e13c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>