OSDN Git Service

am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 05:12:31 +0000 (05:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 05:12:31 +0000 (05:12 +0000)
commit66224e2524e9b6723c783f14598c2e02118ea7f5
tree15c2ebd71e339f1662a47138895604083edcaedb
parent52ee9b99f55cd17c484fcaf2433c688967284468
parent12bbbb2bb71a532f3b3ec59fd9232902420cf3d2
am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev

* commit '12bbbb2bb71a532f3b3ec59fd9232902420cf3d2':
  Resolve color xml attributes properly. [DO NOT MERGE]