tree 14b715de9587f5ba917dc29747f0adc225715e82
parent e9ea028b74950722163560d5dfb97b4403111cc4
parent 1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5
author Deepanshu Gupta <deepanshu@google.com> 1409808761 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409808761 +0000

am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev

* commit '1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5':
  Resolve color xml attributes properly. [DO NOT MERGE]