merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Browse Source

Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e

...

This commit is contained in:

Jean-Baptiste Queru

2010-08-23 19:08:27 -07:00

parent f467ca08dd 8812535137

commit 97b5b76502

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