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)
commit02e731fb6452df796d976cb9e407b210cfffcda5
tree9269d87117f50d1de3adad8b607c751c8f5d9c80
parente55b0e2e88adc2be5958d0ae4ea310997aa2002f
parentfa3663222c6a23ed4fab367186cf56ab04657772
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Change-Id: I1d1d611f22f6d0bc9dbdd29a4b1eff497e1afd74