| commit | 543befb7c222c258ad899de2c7ff9c19ce171186 | [log] [tgz] |
|---|---|---|
| author | Vladislav Kuzkokov <vkuzkokov@google.com> | Thu Oct 13 12:42:59 2016 +0200 |
| committer | Vladislav Kuzkokov <vkuzkokov@google.com> | Thu Oct 13 13:49:13 2016 +0200 |
| tree | 528b0554161c27dea980787ec69c1ac87cdb88a6 | |
| parent | 85730569b129ce36117dabb580c1489931e20fa7 [diff] | |
| parent | 792e051ab8f2d3c107a3c7146a80fddfb2a63502 [diff] |
resolve merge conflicts of 792e051 to master Change-Id: I75e604639959df77ddf11bbb9805392e4141da23