tree 7a33febbd2ef5337940920352817f1bc9fcd9726
parent ae6f2595206d33f04c951c2f3dfff5ede100c942
parent 19fa86cfd6fddb63715b50a4e0bc881d2ea34133
author Deepanshu Gupta <deepanshu@google.com> 1409853581 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409853581 +0000

am 19fa86cf: am 5384d40e: (-s ours) am b79bb54e: am f4ba8731: am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '19fa86cfd6fddb63715b50a4e0bc881d2ea34133':
  Resolve color xml attributes properly. [DO NOT MERGE]