| commit | 92c45b222c54d781cb23c983dc66d80fc9780d45 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu May 08 20:23:39 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu May 08 20:23:39 2014 -0700 |
| tree | dab65aaa477ea31a06cd649ab4b6c9fb6bf11cc7 | |
| parent | 29e832bcceea8abe5a470aa75de3aa47e80b2872 [diff] | |
| parent | 242c14bee570dfae4995df5cf175328e6f4155c7 [diff] |
resolved conflicts for merge of 6a4c12da to master-nova Change-Id: I108a86d599b0d692f8d13f8f3d29187db45c6467