OSDN Git Service

merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
authorJean-Baptiste Queru <jbq@google.com>
Tue, 24 Aug 2010 02:08:20 +0000 (19:08 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 24 Aug 2010 02:08:20 +0000 (19:08 -0700)
commit828ef22db863664b8e992adf15ddf92ef570f4f8
tree570969699e3bf61a9a10237a062801f4704f78fa
parente4be1fd5f14137de249ee66c000f9dadfb2862d7
parent0433734318551aac3b7b82b9d8ab5d485d7d0439
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Change-Id: I5e13be05f736290ca88772aaca51273d3996c6c2