| commit | 3b8290a881aa6743d5a9ac459a2de94481a2e0bb | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 01:36:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 01:36:53 2023 +0000 |
| tree | bbcb1a0ea41302a7fe343516048e5de8b38be49e | |
| parent | 6ff8b636ee1275a463200f54ad6a23e6ba6e22bd [diff] | |
| parent | f0f020c21fd29d8076733e07847e6314172a312e [diff] |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c21f -s ours am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 5bd6bb45d7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483 Change-Id: I173d272ed17c29565f574fa95c146db34d7be4d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>