| commit | 02e731fb6452df796d976cb9e407b210cfffcda5 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:09:14 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:09:14 2010 -0700 |
| tree | 9269d87117f50d1de3adad8b607c751c8f5d9c80 | |
| parent | e55b0e2e88adc2be5958d0ae4ea310997aa2002f [diff] | |
| parent | fa3663222c6a23ed4fab367186cf56ab04657772 [diff] |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: I1d1d611f22f6d0bc9dbdd29a4b1eff497e1afd74