Skip to content
Commit baff8996 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: 80496e6e 

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

Change-Id: I725d41ff0c9a8350e0bcbf32133173a430bb17f5
parents f480556d 80496e6e
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