| commit | 9e40e61e3b031eafc23a3b0a10918fe4bd99161a | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Mon Jul 29 16:27:45 2013 -0700 |
| committer | Michael Wright <michaelwr@google.com> | Mon Jul 29 16:27:45 2013 -0700 |
| tree | 16e88a2b9e421d3d9e7017f9949211da28e34be3 | |
| parent | 64168ed75716eba4335c2ad48a66691f576a9e1a [diff] | |
| parent | 443feae63df2cadf7b728991118dd73527d587c8 [diff] |
resolved conflicts for merge of 443feae6 to master Change-Id: I70b1651bc226c68db0ad0431647c21c6a4866b17