| commit | 73d89b1188bc0791c489aa678b8d342d3eda4df5 | [log] [tgz] |
|---|---|---|
| author | Brian Egizi <begizi@google.com> | Tue Aug 08 21:36:59 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 08 21:36:59 2023 +0000 |
| tree | 312ccb7dd16a808c71ff25e0224514caf3b77dea | |
| parent | efd3409959ddcdeab7c707a4125bc9425927a660 [diff] | |
| parent | a0b968c87578348b996b879f0cd5c7ac0c173dc4 [diff] |
[manual merge] [automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c21f -s ours am: 3b8290a881 -s ours am: 7d29675ebd -s ours am: e7ef06df70 -s ours am: a0dc510a49 -s ours am: affb156d85 -s ours am: a2f4bceba0 -s ours am: c939100250 -s ours am: dabfd4e77b -s ours am: 0f9fbc1282 -s ours -s ours am: a0b968c875 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24360199 Change-Id: I580f0c341500b1a060be8b4c35b2354abebd2af5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>