resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp

Browse Source

Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d

...

This commit is contained in:

Jean-Baptiste Queru

2010-09-02 12:05:33 -07:00

parent 6aa717e4a1 bd6abed3c8

commit d0743dfbee

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