tree cce87b18c790a27e2686055de39138a4bc82e043
parent d0935d86f0f3758e6bc2966ac3f1199bcff61c4c
parent fc5bcdeae5c09bd049c706f54aa23c4fb79a71d3
author Yohann Roussel <yroussel@google.com> 1481562454 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1481562454 +0000

Merge "TEMPORARY HACK: Set a 10 minute timeout on jack-admin commands"