| commit | 526694ea52fae88a10afc6f6c975912358d745f6 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Aug 03 17:15:23 2016 +0200 |
| committer | Jorim Jaggi <jjaggi@google.com> | Wed Aug 03 16:23:28 2016 +0000 |
| tree | a2fd1442a0000923dc9c5b525e10bb524960f874 | |
| parent | 3e27a25b2cc09ea9a1e0d28ef3d36c453f8aa89d [diff] | |
| parent | 3c1b0f04f882f57a88dedefc2f258a752c8abad6 [diff] |
resolve merge conflicts of 3c1b0f0 to master Change-Id: I2314728cba47c28ff580f4dfc69868f8cb5ff5db