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

Browse Source

Change-Id: Icce8b9cb0c6ebfe2c4278c19c50aafb85a9ba4d8

...

This commit is contained in:

Jean-Baptiste Queru 2010-08-30 14:13:18 -07:00

parent db0017e5e2 a172709259

commit c111863fbf

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

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

Diff Content Not Available