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

Browse source

Change-Id: I1d1d611f22f6d0bc9dbdd29a4b1eff497e1afd74

...

This commit is contained in:

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

parent e55b0e2e88 fa3663222c

commit 02e731fb64

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 is not available