| commit | 4023e7f7c93a926213b4faa88a4d7dd0af194ca2 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:09:12 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:09:12 2010 -0700 |
| tree | b4f7d7450b375530a69f92a5d72e2d553c6c09e1 | |
| parent | b5190cc81c5cf5ea7bc8f92734b5824bf0b20854 [diff] | |
| parent | 30b5eaaa481befad78cfcaaae024ca90e0616630 [diff] |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: Ie48a9b3570ab07d2698f9849d056ef34fcc47ad9