| commit | db9f06d9c44cd640f282b1a631ae82d3652beeef | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Nov 12 22:44:11 2009 -0800 |
| committer | Wink Saville <wink@google.com> | Thu Nov 12 22:44:11 2009 -0800 |
| tree | ad1ab8050d875fa67b90688128518a7efcd5b120 | |
| parent | 592988d307e8d305ca163c4e58da0fb350054194 [diff] | |
| parent | 2a1e96412c66f22939c010f10524122718c7bbeb [diff] |
resolved conflicts for merge of 2a1e9641 to eclair-mr2 Change-Id: Ie1e1e686a7ef26a8a3f583c9660930eb16ca2659