| commit | 1d4f71b93b266146e8cf29150a08607bc4efb3bf | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Nov 07 12:45:01 2012 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Nov 07 12:45:01 2012 -0800 |
| tree | fd352a58c305aa98739a6d59237e8bf6d776b057 | |
| parent | e580a4286aa7e7005739a443c987cca30c41a748 [diff] | |
| parent | 01d7fccf9df30f77de5c99d74546d2bbe2955514 [diff] |
resolved conflicts for merge of 01d7fccf to master Change-Id: I48cf8ce905cbbdb4e3300e7ac6c24300666c9fb5