| commit | 40858b24e7183dbb3afe9928d2939833344c7e01 | [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 | 3870e77f24d875c74f6db4d5de77cf63be37e04c | |
| parent | 831f258fd91a1e85fc59aea88a3e26e57d6c40d9 [diff] | |
| parent | c4284d5f900f9436b02b253717f66528326bcf71 [diff] |
resolved conflicts for merge of d26707da to master Change-Id: I1a379194f70c4b14191333ca2d8e6dd9d8b0f9dd