| commit | f04c975dc39fe9b49e51c05807006c5164fbe0ba | [log] [tgz] |
|---|---|---|
| author | Marcus Hagerott <mhagerott@google.com> | Thu Sep 08 15:22:57 2016 -0700 |
| committer | Marcus Hagerott <mhagerott@google.com> | Thu Sep 08 15:42:32 2016 -0700 |
| tree | faf07ea413a9a692608ebe3bc6cbd40b7906119e | |
| parent | e472b50865ef5fef3ad6186e7f1f79c8c16b8d3e [diff] | |
| parent | cf7f295a05bd356ea8715ea456fbe5f6ced9d823 [diff] |
resolve merge conflicts of cf7f295 to master Change-Id: I49249472948c29b97be8fe33cda8fa022d8e62f6