| commit | e6880b74536af86c265d0dac05bc0d4cc43af395 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jun 19 11:15:45 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jun 19 11:15:45 2014 -0700 |
| tree | b5c3686990f287377e048b8eec5e721398b5629b | |
| parent | ce30de3553ecaaa0a85eec8a788e808630d766b4 [diff] | |
| parent | 476b069aa0e86707847b2e7915cde3782aa0e0a8 [diff] |
resolved conflicts for merge of 476b069a to master Change-Id: I647232e584ba29c0a7b57e1f6e520f05f7986bb1