tree cce87b18c790a27e2686055de39138a4bc82e043
parent 6673e8148ceb1037f35fef65b39f5458873520d6
parent 5aff06621b390ee8fbaf57351d04ce74a387ba78
author Yohann Roussel <yroussel@google.com> 1481563591 +0000
committer android-build-merger <android-build-merger@google.com> 1481563591 +0000

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

Change-Id: I626d73d04192317a997f9521ab7bfba6e25dfcb4