| commit | 965f9dc45345486e885b59b4776f0ca5e765ec20 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:07:40 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:07:40 2010 -0700 |
| tree | 1580e8bafbe8a12d59820ef1b591b05bc093cf0b | |
| parent | fbd7ae7a1ce0060221241ed02c576983c1f48d34 [diff] | |
| parent | dff87121ad861dc830fc96823725b466d80d1110 [diff] |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: I4d56dc0235f3df1306736c42144dccb26b876b74