tree eff6d134ccc533ebe7536718dacfedd4407cd175
parent 397d2b995cbb01f41e89f101efa938e8b09f67ab
parent 8e39ce19847a9312c472473fd2247a803c7e2933
author Cosmos Nicolaou <cnicolaou@google.com> 1410498381 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1410498381 +0000

Merge "veyron/lib/modules/core: increase the timouts for less flakiness with -race."