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

Browse Source

Change-Id: I9fcbbe3ac77b81576578ce4be87a51a8f198627f

...

This commit is contained in:

Jean-Baptiste Queru 2010-08-23 19:09:06 -07:00

parent 9382eb9ff2 97b8f590e1

commit 456208a6d9

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