| commit | 6b6765b146c75d569c3c0c94bdb765ea855a7b76 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 01:15:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 01:15:38 2023 +0000 |
| tree | 12cc34b65360a7c7b8305fc81d64ca7f3e1a3ec3 | |
| parent | a1797b3310c8ff22161d1fe67a0f6bf5e3c3ada7 [diff] | |
| parent | 4306517b07d1cda359dde916658331c99348e876 [diff] |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 976fd54a43 -s ours am: 4306517b07 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602 Change-Id: Id4befa82bf4b39153259c378c7e0abfc4cd9ecea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>