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

Browse Source

* commit '3f1cc48ad1f87e8ea35d2d706eafb707743cc662':
  Resolve color xml attributes properly. [DO NOT MERGE]

...

This commit is contained in:

Deepanshu Gupta

2014-09-04 05:56:35 +00:00

committed by Android Git Automerger

parent 80b9016110 3f1cc48ad1

commit 06a3125513

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