| commit | 32cd68e6eaed692222786831809bb82e42de4d65 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Tue Aug 08 02:16:52 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 02:16:52 2023 +0000 |
| tree | 4cb7fba5e37a583620a447a28828ac54e58e632a | |
| parent | f727511022c9b6ea62e438e406ae15c9a5614ebe [diff] | |
| parent | 677b43cbc77aa3ac33496acb72b8a312a8796ead [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-dev am: 65b97b1586 am: 677b43cbc7 -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: I24adfa6dd526b8986e93d93c1d1a6a94e0acb71f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>