tree 7a33febbd2ef5337940920352817f1bc9fcd9726
parent 6a6e63a0efed47fea0b1f080a3092d7931941851
parent 06a31255133bcc21ed2f1d821b5e120fefddc117
author Deepanshu Gupta <deepanshu@google.com> 1409810841 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409810841 +0000

am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev

* commit '06a31255133bcc21ed2f1d821b5e120fefddc117':
  Resolve color xml attributes properly. [DO NOT MERGE]