| commit | affb156d85a1df721f9e0db2c199680e50e5989e | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:07:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:07:36 2023 +0000 |
| tree | 12cc34b65360a7c7b8305fc81d64ca7f3e1a3ec3 | |
| parent | 324233db2c951517cf1589fa1151b7bf8d2f4e5e [diff] | |
| parent | a0dc510a49987f172f80dae1a0d49b33af069c21 [diff] |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c21f -s ours am: 3b8290a881 -s ours am: 7d29675ebd -s ours am: e7ef06df70 -s ours am: a0dc510a49 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483 Change-Id: I50504bb1ca4dc326a95b76e41e9f6a09b6d98465 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>