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

Browse Source

Change-Id: I04fb94c91958bcba3e587a8bf523c551d964f761

...

This commit is contained in:

Jean-Baptiste Queru 2010-08-17 07:41:59 -07:00

parent 7eea57b675 e02856c0f9

commit c9fe8110e0

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