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

Browse Source

* commit '2d70a5a9d1556f269b8ed79b1f6a896ce8241b51':
  Resolve color xml attributes properly. [DO NOT MERGE]

...

This commit is contained in:

Deepanshu Gupta

2014-09-04 06:16:36 +00:00

committed by Android Git Automerger

parent ccd53eecb9 2d70a5a9d1

commit a4d9786682

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available