| commit | e1fd97242bcac3c546c35a2576df3fafee04d25a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 07 13:51:14 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 07 13:51:14 2010 -0800 |
| tree | 1e7159442ca7f4b16fe15737f1dde5dd81b82a26 | |
| parent | 30e615de6f8d5c407ba53ac98845887c331c51ff [diff] | |
| parent | 22e1e357b6053b572820b54ed8f2b8fe3c1eb0f8 [diff] |
resolved conflicts for merge of 22e1e357 to master Change-Id: I96ff536c0d1c000a6b6d5b0b2ea5a3849b21985e