| commit | 5aa1c034d9bfdb2744f637c4686adf20a7ed9975 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jul 29 16:15:19 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Jul 29 16:15:19 2010 -0700 |
| tree | 0bfd44ad0815b844909764e073e8194e3ebafc60 | |
| parent | 51ad36e8f25bb81e0e6e2cf9897d4fbeb4fc49cb [diff] | |
| parent | 8a76a9085dbbca87b4c172577ca264d8b5f2ab32 [diff] |
resolved conflicts for merge of 8a76a908 to master Change-Id: I8983d5c93dfa12d87449ac9f9a17a5aafdadef0a