| commit | e48f428b98b6c40d6f0300cb1c541cb883ce695d | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Nov 06 17:32:44 2015 +0100 |
| committer | Jorim Jaggi <jjaggi@google.com> | Fri Nov 06 20:25:49 2015 +0100 |
| tree | 5b750fc4c48cfcdffc133a3c8116945813cb8455 | |
| parent | dcf467ca36130aa719a4954da7578217147b20a0 [diff] |
Restore changes lost during merge Change-Id: I619be025988470e27b614ed0ad009e5d785f19eb