| commit | 8fed472038d395ef256f85ed7b831a59173ab25c | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:28:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:28:02 2023 +0000 |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 | |
| parent | 7a80a00710bfb3efa79a1815e8c1eefb270ada36 [diff] | |
| parent | 1268ee0881ae7fc2f37bb1c23aee21444ea0ce95 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-qpr1-dev am: 2028c143ae -s ours am: 34cc50a453 -s ours am: 4876714be3 -s ours am: 7622520b19 -s ours am: 8e84da7427 -s ours am: 1268ee0881 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602 Change-Id: Idd723dc239faf564f2ddf028e63635c139dd8319 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>