| commit | 09fa73b3c334da4c061fc346dc65714f8738e5f1 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Oct 22 12:29:10 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Oct 22 12:29:27 2010 -0700 |
| tree | 9858c60919e21291ee9a0d935ff44c86393cb527 | |
| parent | 6c75cb3752d51adfd3c7b72672f5abacdc4cf2bd [diff] | |
| parent | 8928ef8b4cc46bf9c5be3466ad8cb4ab40bb8a2c [diff] |
resolved conflicts for merge of 8928ef8b to master Change-Id: I0c2fa435b38266f71651756570926c4b1488b57e