| commit | 568e54be71731bdbcd5338385eb6cc6a082c9456 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Thu Jan 15 00:12:18 2015 +0100 |
| committer | Jorim Jaggi <jjaggi@google.com> | Thu Jan 15 00:12:18 2015 +0100 |
| tree | 9cbbe50e8824a72d7afda5ef75a45584742e200a | |
| parent | 4bc5b2bce9b1e3483357966f4ef074391565255f [diff] | |
| parent | 87f536948c06e57d2f9e78f39c01272cb08de1f1 [diff] |
resolve merge conflicts of 87f5369 to master. Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086