| commit | 3410a80f4aafe5685da61c217808d2bf21d55dfc | [log] [tgz] |
|---|---|---|
| author | Dmitri Plotnikov <dplotnikov@google.com> | Thu Nov 05 20:17:31 2009 -0800 |
| committer | Dmitri Plotnikov <dplotnikov@google.com> | Thu Nov 05 20:20:43 2009 -0800 |
| tree | fe3052335a75065234854a0a1efce3a39df0a418 | |
| parent | 047763296d2c98bd4121252486cc0df87b25bc31 [diff] | |
| parent | 1c8e40c18f92722b9bec6e8ce2e345a9828efa16 [diff] |
resolved conflicts for merge of 1c8e40c1 to eclair-mr2 Change-Id: I5c8e9e76c79a5c70d214bc0b28360c41c07e7b85