| commit | 10f091ece5c5bf23c85d77e35f905f88d35fdc20 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Sep 02 12:05:33 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Sep 02 12:05:33 2010 -0700 |
| tree | 5a438d33fa40180d101fc1ad648ae2e7d3acbe3c | |
| parent | 571c37bb7ab84ccb17613147aeb7334409e76669 [diff] | |
| parent | 1a7df62c0122fd5a98cb55bfa08c50da413ad69e [diff] |
resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d