OSDN Git Service

Merge "Factor and consolidate style and color names."
authorBen Kwa <kenobi@google.com>
Fri, 4 Sep 2015 22:01:45 +0000 (22:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 4 Sep 2015 22:01:45 +0000 (22:01 +0000)

Trivial merge