| commit | c2475fbb4c227819db93a87f26eec94f52c288ae | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 21 11:44:49 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 21 11:44:49 2010 -0700 |
| tree | f91cb892df9bd1d6465ec73ad7d1731f9ce26b8d | |
| parent | 93dc104209e267d69dfb40b3dfbb651300809968 [diff] | |
| parent | 2198ddbc383027708ca5dcd3f01fbcba1c859c63 [diff] |
resolved conflicts for merge of 6c9a3004 to master Change-Id: Ia1a8a2015c087004d3dfc64681dbe0315558dc95