| commit | a1b232493d76bdf5e56fc5aae2a45691d6774369 | [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 | 2fdc3157853e469b8ecc5fd8cfad71e42e08a84a | |
| parent | 01f0908b3e8c759a9fcd565f6bc6cc6c4033678f [diff] | |
| parent | e2e6ffa7f15b8ee33448e255edc231a9d01923b2 [diff] |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e