Commits
Deepanshu Gupta authored and Android Git Automerger committed 889ec19249fM
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]
Showing diff to9f7c594a054