OSDN Git Service

am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 04:32:46 +0000 (04:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 04:32:46 +0000 (04:32 +0000)
commit338e32ba521df8cbd295e69d8f20626452baa4a5
treeaa0a95225a2ba17615c08660b9c41ede1f76aa16
parenta82db08e1d5f2c7b1751a93bc10d0fc5d231f9e4
parent6c1bf6b161cf3c18b49831eba71811d3fa00d108
am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '6c1bf6b161cf3c18b49831eba71811d3fa00d108':
  Resolve color xml attributes properly. [DO NOT MERGE]