am 81cd0d8d: (-s ours) am a780eee4: Merge "Resolve color xml attributes...
am 81cd0d8d: (-s ours) am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
* commit '81cd0d8d':
Resolve color xml attributes properly. [DO NOT MERGE]