Commits
Deepanshu Gupta authored and Android Git Automerger committed cd31f76067dM
am 4a4683c7: (-s ours) am a92f199d: am 0ddd915f: am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev * commit '4a4683c72a649b6435e872b71936a68dd97fe408': Resolve color xml attributes properly. [DO NOT MERGE]
Showing diff toaa52a6c33e1