am 338e32ba: (-s ours) am 6c1bf6b1: am 2db4037c: am 4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '338e32ba521df8cbd295e69d8f20626452baa4a5': Resolve color xml attributes properly. [DO NOT MERGE]
This commit is contained in: