am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev

* commit 'a4d978668219572b71538dc98dab461fe99dfcc3':
  Resolve color xml attributes properly. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-09-04 06:26:25 +00:00
committed by Android Git Automerger

Diff Content Not Available