| commit | 198052175a6b6de166676925f89439efe86aac0f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Feb 05 08:33:35 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Feb 05 08:34:30 2010 -0800 |
| tree | 5f3c6839a82b2cd109ea7f25ea003dd5bc08866e | |
| parent | fa88015911d3c3e4c5a8cb7903747dd6c21ba7ec [diff] | |
| parent | bb2edab6e4eebe51514746a558e287f238231c93 [diff] |
resolved conflicts for merge of bb2edab6 to eclair-plus-aosp