| commit | bbf6e5e0c50fad76dcd95ec356030c932091d804 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Tue Aug 02 22:26:55 2016 +0200 |
| committer | Jorim Jaggi <jjaggi@google.com> | Tue Aug 02 22:26:55 2016 +0200 |
| tree | e4f4dfff6d86a336c9c42489f1c71f19b2386e72 | |
| parent | 7793bd41b76ee5d16aebba3a00be47229706ea39 [diff] | |
| parent | 4c839a59b333b306dfb0a7550f4c55dc07fffcaa [diff] |
resolve merge conflicts of 4c839a5 to master Change-Id: Ie02e2b015c03512615fa25a0f4f0e955fd6910be