| commit | b58d385e17f3b71705f23fe77aa8c12147ec9ea5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Jul 09 17:40:24 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Jul 09 17:40:24 2014 -0700 |
| tree | a99a16474c02c9c8f25cf48d387a45bada8144a4 | |
| parent | 051a3204d47d848dbe275c0db0acc3f7f7d12b55 [diff] | |
| parent | f6be5a7ac8c3891d79dd836ac5cfdc0588859494 [diff] |
resolved conflicts for merge of f6be5a7a to master Change-Id: I6dcfb33981df90877fb9f3752b853cf377633edf