resolved conflicts for merge of 3a271718 to jb-mr2-dev-plus-aosp

Browse Source

Change-Id: If405c0e3ccff4029c2b54cf557d09c086485ab20

...

This commit is contained in:

Kenny Root

2013-04-08 12:06:29 -07:00

parent 56e75f3c17 3a27171881

commit d1e485a8fc

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