tree cce87b18c790a27e2686055de39138a4bc82e043
parent f078c2031b515c58be93500bcefb23d491c64f4c
parent 72ddb3172205dab439d68e26a43d16742d868a6e
author Yohann Roussel <yroussel@google.com> 1481562899 +0000
committer android-build-merger <android-build-merger@google.com> 1481562899 +0000

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

Change-Id: Icb4c3447ce7c789f4dc7ab54accaa7f83dc0045b