commit | fda119584e02c917ef10a45fe2a15ed718a29c8f | [log] [tgz] |
---|---|---|
author | Matt Pietal <mpietal@google.com> | Thu Jul 08 14:06:28 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 08 14:06:28 2021 +0000 |
tree | fb85b172dcaa0e369bbfff3645c0baac84cbf686 | |
parent | cfab46b6e8149401bdf9491600fc12ae16085920 [diff] | |
parent | 04781ed449768a218227f29d09a387610b4338b5 [diff] |
Merge "Change back to Device controls" into sc-dev am: 04781ed449 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15224887 Change-Id: Ic48a4c89138011a82ac892c7373f978c2130c52a