am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO...
am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
* commit 'ae6a52eb':
Resolve color xml attributes properly. [DO NOT MERGE]