tree 97c139d55b580f53c54dd079594bc6bc16c8a7b9
parent 9f7c594a05411191d83ccb21655fbd8d52f56189
parent a7ce11070a74f7a0447f0d40d51cb0d3f95999fd
author Deepanshu Gupta <deepanshu@google.com> 1409854239 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409854239 +0000

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