tree 84298a839546b422a3c25d515d575dc2b28ea612
parent dffdfb9ecb8c3b0b3faaf0ca204b963410a3a47d
parent 38ba3fedc6f7cbeefdcf64775f34aa61a85b9563
author Mathieu Chartier <mathieuc@google.com> 1436390515 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1436390516 +0000

Merge "Use trap + async timeout for tests"