| commit | f727511022c9b6ea62e438e406ae15c9a5614ebe | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 02:16:46 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 02:16:46 2023 +0000 |
| tree | 4cb7fba5e37a583620a447a28828ac54e58e632a | |
| parent | a50c71677374ed17f228276bc6f6eb14dafd72af [diff] | |
| parent | 5041574a8d3fca0c7847d39fe64de36e0a45b8a4 [diff] |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 8c2d2c6fc9 am: 5041574a8d -s ours am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 efc2b69c88 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301063 Change-Id: I38b7bf1dfc91dc712601abb42e52f84dded51036 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>