| commit | b2520c7f1348cfcb3fa9c2e039140c1addb7688a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu May 06 16:20:06 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu May 06 16:20:06 2010 -0700 |
| tree | 4eb9a83f36e570f4b42b03840988ecf9b96d549a | |
| parent | c2c146902f6258c16612b05d4b281c8a60b59898 [diff] | |
| parent | fd1674c75d7b6500168137a2213877e45e49bbd2 [diff] |
manual merge from froyo Change-Id: I0f7ff92c18a3d047047fd8aca04e0bda4a8c97b9