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:09:14 +0000 (19:09 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 24 Aug 2010 02:09:14 +0000 (19:09 -0700)
Change-Id: I1d1d611f22f6d0bc9dbdd29a4b1eff497e1afd74


Trivial merge