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

Browse Source

Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8

...

This commit is contained in:

Jean-Baptiste Queru 2010-11-22 16:32:34 -08:00

parent 07db9276c0 dba567c4ae

commit 37e7e9e052

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