resolved conflicts for merge of 7816eded to gingerbread-plus-aosp

Browse Source

Change-Id: I1f7d1f488f6a86774962d427aca472a8a444e0aa

...

This commit is contained in:

David 'Digit' Turner

2011-07-12 00:57:09 +02:00

parent 7022db4cd2 7816eded41

commit db4c5f352d

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