| commit | ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Apr 24 17:18:10 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Apr 24 17:18:10 2014 -0700 |
| tree | 77d9d3a96daacf86575bb486ad5ea214e003a90a | |
| parent | 23af77a3cd1febc740d885ff03ead09837df269c [diff] | |
| parent | 02e857441fcc27134f335aee659d553641a2b2ab [diff] |
resolved conflicts for merge of 02e85744 to master Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9