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

Browse Source

Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf

...

This commit is contained in:

Jean-Baptiste Queru 2010-11-19 16:21:31 -08:00

parent 4d43367eda 1351c0e488

commit f863896d52

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