| commit | e07d6a776ad818e21de3598d115ec5de0b12481b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:09:17 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 23 19:09:17 2010 -0700 |
| tree | a394c40f68efc5dab013eeebefc175cb45b49fe5 | |
| parent | 78c4611719f10b4a53ade54ab5eeb390061737a3 [diff] | |
| parent | 479a3a7891e23521cfb7ea1e835b8b3cfb882c5f [diff] |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward Change-Id: I1dba838629fe6e7c16f7684a0d438328cda1c325