resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp

Browse Source

Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8

...

This commit is contained in:

Jean-Baptiste Queru 2010-11-17 16:47:59 -08:00

parent ae1f9dce70 3bffa0529c

commit 8ff8a2d029

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