Commits
Deepanshu Gupta authored and Android Git Automerger committed 033a54ec746M
am c33fc8de: (-s ours) am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev * commit 'c33fc8de1ddd2d27a499c146169b870513afca3b': Resolve color xml attributes properly. [DO NOT MERGE]
Showing diff to5d1755e9f51