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 '66224e2524e9b6723c783f14598c2e02118ea7f5':
  Resolve color xml attributes properly. [DO NOT MERGE]