tree 8233b79ef0a18576041801bc14dd8d4bcd4e5dc2
parent 409e42a17eeedf125d012ebc3f1d91fcf5812573
parent 5384d40ed4ec8f3546be94e6cae7c0011ef235a5
author Deepanshu Gupta <deepanshu@google.com> 1409852771 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409852771 +0000

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