| commit | 2806b1f77f710810cc7f3a51e68642012fb43b8c | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Fri Sep 11 16:07:56 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Sep 11 16:07:56 2015 +0000 |
| tree | bd52e953faa03afb657e7b1c59f95dbb69ef5ed6 | |
| parent | dd0898e54fb76a7181eef4d6267dd6e5a0e9f999 [diff] | |
| parent | 74fe74478c9112ab9fb042f1dfb0d9ac2b7ab9e2 [diff] |
Merge "Revert "Fixes unnecessary multi-merge steps.""