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)
commit6c1bf6b161cf3c18b49831eba71811d3fa00d108
tree079a11e6d677b4dd47c8b95b1e7e9c1ab614374d
parente73e14fd02f50e0e9b3fb3ca890de7cb96d8d48b
parent2db4037c628c70f6206a05ade4e606e0b47e9f7c
am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '2db4037c628c70f6206a05ade4e606e0b47e9f7c':
  Resolve color xml attributes properly. [DO NOT MERGE]