tree 4afaf81b2730a00bd3999c9e4b421aa6460e9d08
parent 252fe5f4eeb84c0521a3132d7afb82850b6130a7
author Cosmos Nicolaou <cnicolaou@google.com> 1415294392 -0800
committer Cosmos Nicolaou <cnicolaou@google.com> 1415294392 -0800

Partially fix breakage following:

https://veyron-review.googlesource.com/#/c/6278/

but a further fix is needed for:

https://veyron-review.googlesource.com/#/c/6373/

Change-Id: I1da390497ad28ff3a0f5b7a420cfb0eb923d4d95