tree 347c8e36ac7aebc793c9401fe0348d6303032ae8
parent b4154d33eb51de747cc517dd270b58619b3a3122
parent 732350b9f19f85421368f533f7e3c0b2e4e08928
author Vladimir Marko <vmarko@google.com> 1461143207 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1461143207 +0000

Merge "Revert "Increase timeout for the 570-checker-osr test from 20s to 60s.""