| commit | fd222fc2f8c27ebea1bad050f6fd61ab3b954ea2 | [log] [tgz] |
|---|---|---|
| author | Gustav Sennton <gsennton@google.com> | Thu Jun 16 20:24:23 2016 +0100 |
| committer | Gustav Sennton <gsennton@google.com> | Fri Jun 17 09:38:55 2016 +0100 |
| tree | 54c3e361bb1843cfbdd3f0e673347aa0e73e94a4 | |
| parent | 076539efdb3aa0cec0be75a104505f7593ae06c6 [diff] | |
| parent | 6cbf1376bc1e7e67046664f12bd236ceb4301c64 [diff] |
resolve merge conflicts of 6cbf137 to master Change-Id: Idc548a46e96464c11193cf8480d9fb4e07aa438f