| commit | 34acfcf6858fa4c9183d4e4d2e10f15cf932285f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:07:41 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:07:41 2010 -0700 |
| tree | 2201f93b2e32295155582c42f8a68c03993df21e | |
| parent | ffff0028ae9a83893f71efa370d283e2247bcdd4 [diff] | |
| parent | 477ddfcaabc754d2e36f619d609a100eb50d8b7d [diff] |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: Ic1040aa7e00cdc01af2f2cb4c741bafe4936904c