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

Browse Source

Change-Id: I4d56dc0235f3df1306736c42144dccb26b876b74

...

This commit is contained in:

Jean-Baptiste Queru 2010-08-23 19:07:40 -07:00

parent fbd7ae7a1c dff87121ad

commit 965f9dc453

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