| commit | 249a45363a00e325ea383538f62dc31edc7e085c | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Tue Aug 22 13:28:57 2017 +0200 |
| committer | Jorim Jaggi <jjaggi@google.com> | Tue Aug 22 13:28:57 2017 +0200 |
| tree | 7024bd1bf8ec97c214e025983f3b90e5fa03150a | |
| parent | 12e78b458cf84fbcd1dd53643f23c88075bb9465 [diff] | |
| parent | c55cce487c649b4f068873b669b5c9f336ced3fc [diff] |
resolve merge conflicts of c55cce487c64 to master Change-Id: If833e3c5efed891fb1ba7b32b2edc96a60ea2566