tree 1d32a32d2460cf46d808034dd83cd28c3be375e8
parent 16099eed0fa1bf2e2111da1ad16dd1fb699f4a85
parent 7f26655a5bcaa8a6273ed603a465090d0e434d07
author Deepanshu Gupta <deepanshu@google.com> 1409812637 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409812637 +0000

am 7f26655a: (-s ours) am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev

* commit '7f26655a5bcaa8a6273ed603a465090d0e434d07':
  Resolve color xml attributes properly. [DO NOT MERGE]