| commit | 5aff06621b390ee8fbaf57351d04ce74a387ba78 | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Mon Dec 12 17:20:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 12 17:20:58 2016 +0000 |
| tree | cce87b18c790a27e2686055de39138a4bc82e043 | |
| parent | b7123504ec40c6fb0cb8b815d4bb33cf56ac27c3 [diff] | |
| parent | f1e7a45dc61cec37d636e6dbb0b3d1c60c24c0f3 [diff] |
Merge "TEMPORARY HACK: Set a 10 minute timeout on jack-admin commands" am: 72ddb31722 am: f1e7a45dc6 Change-Id: I52f2d596ae71ed06c3ca2ac13df6a19fec189332