am 5384d40e: (-s ours) am b79bb54e: am f4ba8731: 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 '5384d40ed4ec8f3546be94e6cae7c0011ef235a5':
  Resolve color xml attributes properly. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-09-04 17:46:11 +00:00
committed by Android Git Automerger

Diff Content Not Available