| commit | 2fcfc9439a83d157ec417310665d15d7f99b13f9 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 02:18:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 02:18:44 2023 +0000 |
| tree | 4cb7fba5e37a583620a447a28828ac54e58e632a | |
| parent | 98f92dd44cc27813515769a3b5ded36651bf4bea [diff] | |
| parent | 96aa5fc1831dc7c3e2aa01445d48bf76071ea8c4 [diff] |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 976fd54a43 -s ours am: 4306517b07 -s ours am: 6b6765b146 -s ours am: 96aa5fc183 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602 Change-Id: I03a5b8b779e79859d3e37d8d08e522f7b00f793e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>