tree 14b715de9587f5ba917dc29747f0adc225715e82
parent 9ee1556d601e1f1f60a01bb7137bad48a7923a3d
parent f4ba8731441035d8f3bc4dc622e2eca6eeb47a3d
author Deepanshu Gupta <deepanshu@google.com> 1409851327 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409851327 +0000

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 'f4ba8731441035d8f3bc4dc622e2eca6eeb47a3d':
  Resolve color xml attributes properly. [DO NOT MERGE]