| commit | d0743dfbeeb1fb5d63a6be2631e9aa2107233291 | [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 | e1572369a3f56c348d9dc5a59a0a7fe7b1a26fd6 | |
| parent | 6aa717e4a190cc23f61b93770ee1f80243c0f8e7 [diff] | |
| parent | bd6abed3c8c7c0215fd937d27f1eda1ee88d11a1 [diff] |
resolved conflicts for merge of bd6abed3 to gingerbread-plus-aosp Change-Id: I5522eaf85b157efede96399856fb67a1f244dd9d