am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO...
am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '2db4037c':
Resolve color xml attributes properly. [DO NOT MERGE]