tree 85480a6878ff45ef27df5c3611f5d50af6a68dcd
parent 5d1755e9f51f81d54a3566aa6304919fbf467091
parent c33fc8de1ddd2d27a499c146169b870513afca3b
author Deepanshu Gupta <deepanshu@google.com> 1409850898 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409850898 +0000

am c33fc8de: (-s ours) 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 'c33fc8de1ddd2d27a499c146169b870513afca3b':
  Resolve color xml attributes properly. [DO NOT MERGE]