OSDN Git Service

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


Trivial merge