| commit | 97b5b7650236dd102fa48b51d9361289724a50e9 | [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 | 1c21ca938a4c44914828d6783b4a39197fd779d9 | |
| parent | f467ca08dda9efece674efb0cc70c45fab4973a6 [diff] | |
| parent | 8812535137ca657f6830dd01189c429bdb13c237 [diff] |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e