resolved conflicts for merge of 4130c80a to gingerbread-plus-aosp

Browse Source

Change-Id: I4c37c4a6a54c3fb005eec4789bfcf96678d8cec9

...

This commit is contained in:

Jean-Baptiste Queru

2010-11-19 10:58:11 -08:00

parent f41934fcd4 4130c80aa3

commit cc21582fb3

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