| commit | 55744530222288c79a5e1aa61b65f7f6b2262fab | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 25 17:28:29 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 25 17:28:29 2010 -0700 |
| tree | d06ae88f8c090791da3d63002642543d1d4af289 | |
| parent | f0b3fa60dba67e904a2336980ecbb937d32b2387 [diff] | |
| parent | 66a5d695ed9268869ca50e304bfeabd2a021c6cd [diff] |
Merge "resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp