OSDN Git Service

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


Trivial merge