OSDN Git Service

am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 05:33:14 +0000 (05:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 05:33:14 +0000 (05:33 +0000)
commitc33fc8de1ddd2d27a499c146169b870513afca3b
treeaa0a95225a2ba17615c08660b9c41ede1f76aa16
parentc634383ac49b03cd8fd152b4278cad1b94b84bcf
parent48349ea91823112e3fd2d431116027aed743b1a4
am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev

* commit '48349ea91823112e3fd2d431116027aed743b1a4':
  Resolve color xml attributes properly. [DO NOT MERGE]