Skip to content
Commit 2c705563 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Change back to Device controls" into sc-dev am: 04781ed4 am: 4a7ebf89 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15224887

Change-Id: Ic063c4cf2ff073ac8189bdf4233db84c9b4bdc41
parents 67e8732c 4a7ebf89
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment