commit | 2fc75eba807a01e0ab036c0d7c837185b4432c3b | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Nov 18 03:41:27 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 18 03:41:27 2021 +0000 |
tree | 9ed91f5690654f0fad4a59590d3a6084feb0758a | |
parent | 0fefda68703c7532b7a29a1706e933aad4fb9a4d [diff] | |
parent | b84b7d586a9997608e1188134e5892006581ef0c [diff] |
Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16265888 Change-Id: Idb41f923cdbe1ebc251a1c033d8066404898f768