tree 42eb9ca798245b12de803c54dd70a950b7a16a74
parent 27ee075c6870ac2c4e48ca074503f04e75a3a6de
parent a7d4adaac78ccd1f74006b57ec6a7c581249c8cd
author Michael Kwan <mkwan@google.com> 1467242252 +0000
committer android-build-merger <android-build-merger@google.com> 1467242252 +0000

Merge \"Updated colour theme for watch devices.\" into nyc-mr1-dev
am: a7d4adaac7

Change-Id: I684caf5e6e007582b2b0e73e246d582399417042