resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp

Browse Source

Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617

...

This commit is contained in:

Jean-Baptiste Queru 2010-09-10 09:53:43 -07:00

parent 1205c8be1b afdf77bb9c

commit 57cbf0857f

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