| commit | 456208a6d9b0dddd6a00c77a28ce961cf92d47e7 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:09:06 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:09:06 2010 -0700 |
| tree | 0d9357c514ffc608cad1bcdb6576b7212b7e080e | |
| parent | 9382eb9ff21855e98b67392f99d721a78a4cfab0 [diff] | |
| parent | 97b8f590e1ccfaac4bd4a3d12144ec11e8a629d7 [diff] |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: I9fcbbe3ac77b81576578ce4be87a51a8f198627f