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)
Change-Id: I5e13be05f736290ca88772aaca51273d3996c6c2


Trivial merge