| commit | 224c03fb119e452b8d9fa7fd6384c5df2cf2e358 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 03:54:43 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 03:54:43 2023 +0000 |
| tree | d72875ddd02a38f67dcb3d4629ea01f1ba7eb2c8 | |
| parent | 5fb29c4987262b85f1eefb10d195ad97753d9793 [diff] | |
| parent | 8fed472038d395ef256f85ed7b831a59173ab25c [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: 8fed472038 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602 Change-Id: I00a5f029c5ce0191b31376a793953527f51ebb5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>