| commit | b03c4592248d8d0a59c7c914c422a50bde6e1644 | [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 | b03343c5fca4f65970be5a94ae45267d17ed5693 | |
| parent | 57b7c0b7a0bafe363157afb06bcd08b37223cede [diff] | |
| parent | 877d231382b8dc08d32fb66f6e02faeb1953f660 [diff] |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e