tree 1c9e396809324b2dc90a6288bb02dfdf2ea82adf
parent 2be81615b2b862ee064d5ed03e8ba44d6168b3ff
parent 889ec19249fecfa7121c77b4c2bb32a054311cb5
author Deepanshu Gupta <deepanshu@google.com> 1409854652 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409854652 +0000

am 889ec192: am a7ce1107: 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 '889ec19249fecfa7121c77b4c2bb32a054311cb5':
  Resolve color xml attributes properly. [DO NOT MERGE]