| commit | cee3c3ce811312681941a6d51931acbeff627b06 | [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 | 082a4997960c23da4fbacc33a6544dc250e4fa16 | |
| parent | a4380b6ad904dfb83a5778122873ccfce87d7911 [diff] | |
| parent | bc782c32753bbb0d5b7b09e8b273d7ce562eddb9 [diff] |
resolved conflicts for merge of 2a1e9641 to eclair-mr2 Change-Id: Ie1e1e686a7ef26a8a3f583c9660930eb16ca2659