| commit | 53c0fc53a3a8e9fa07f58979af6270f241c344e0 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 01:39:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 01:39:01 2023 +0000 |
| tree | a90e4cf5dd41c1e703b48306c317851ccbf9d468 | |
| parent | 00bf4456c3234c3ad55fab4d3bbf0723f5827e5f [diff] | |
| parent | 4876714be32f1b272c92842d39db3e1f5fc5fa58 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602 Change-Id: Ida7551895f42571563bc490e575687e91378e21e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>