OSDN Git Service

am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 05:32:41 +0000 (05:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 05:32:41 +0000 (05:32 +0000)
* commit '1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5':
  Resolve color xml attributes properly. [DO NOT MERGE]


Trivial merge