Commits
Deepanshu Gupta authored and Android Git Automerger committed 7119fbb63a3M
am 4df075bc: am 057eb404: (-s ours) am a5176670: am 033a54ec: 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 '4df075bcb5770ba411b6a32c9daeac24da0597e2': Resolve color xml attributes properly. [DO NOT MERGE]
Showing diff to4df075bcb57