| commit | dfc97b4aa1aa89f3ad36606f749ac1a01c10dfe6 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 09:05:27 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 17 09:05:27 2010 -0700 |
| tree | edeb5f4254e4d11b9835b1f00fb7acc8be73e5a4 | |
| parent | f05a399bc0b46982ebf4a123534e874304733d1c [diff] | |
| parent | 28a989b03bc7be084705cf9d2a29e385917a7edd [diff] |
Merge "resolved conflicts for merge of be50507b to gingerbread-plus-aosp" into gingerbread-plus-aosp