tree 5b750fc4c48cfcdffc133a3c8116945813cb8455
parent dcf467ca36130aa719a4954da7578217147b20a0
author Jorim Jaggi <jjaggi@google.com> 1446827564 +0100
committer Jorim Jaggi <jjaggi@google.com> 1446837949 +0100

Restore changes lost during merge

Change-Id: I619be025988470e27b614ed0ad009e5d785f19eb