tree 4c8d3ef95bcd911271108a2a34b4dc1d89de0f3c
parent e2c77f903504766102fe545af40c3e4ebcb3adc7
author Jorim Jaggi <jjaggi@google.com> 1484308842 +0100
committer Jorim Jaggi <jjaggi@google.com> 1484308842 +0100

Fix bad merge

Test: Boot device, hope for the best
Change-Id: I0231874a5f4d7cc8b49cc6f978c17c1af6fa93be
Fixes: 34227241