OSDN Git Service

Merge "Add colours for disabled state for switch in SwitchPreference for watch device...
authorMichael Kwan <mkwan@google.com>
Mon, 8 Aug 2016 17:19:07 +0000 (17:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Aug 2016 17:19:07 +0000 (17:19 +0000)
am: 7b1e63c416

Change-Id: Iaec56a5db9a6f2511c66327f83f028ba438148ba


Trivial merge