| commit | fa101530bc74bdf1517a1840a9415249211b9414 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jan 12 11:53:42 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Jan 12 11:53:42 2010 -0800 |
| tree | f0c93712359e7b102a1ed5edd2fb81a7f6ecb374 | |
| parent | 8f028a94fc533e75077485a7d11a04e4de820335 [diff] | |
| parent | d26707da8965bffb63c55d729f19ddfcb83044b3 [diff] |
resolved conflicts for merge of d26707da to master Change-Id: I1a379194f70c4b14191333ca2d8e6dd9d8b0f9dd