| commit | 7912d8bd00d6837c15bf9c59ea2f4b8812775cea | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:08:27 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:08:27 2010 -0700 |
| tree | 4e2e82d02f17f140775c286aaa41f23769c4fb18 | |
| parent | ab80f2aea55b26f593a3e57ed3516c4667d516f0 [diff] | |
| parent | 2965922c1fec7a1a7e2812334e6a312038c9de0c [diff] |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e