| commit | 0a2f45ab1fd5234508b6ed28e105372b379f8188 | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Mon Dec 12 17:33:14 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Dec 12 17:33:14 2016 +0000 |
| tree | c3e23961cc5a36af3d4d0a18b3adb3f5d265e1ee | |
| parent | 88842d32b78c5945ece4ba47ac4e1fcaf1e8df35 [diff] | |
| parent | b82bb77c3f463495d87a6d05e0f630bf3094be00 [diff] |
Merge "TEMPORARY HACK: Set a 10 minute timeout on jack-admin commands" am: 72ddb31722 am: f1e7a45dc6 am: 5aff06621b am: b82bb77c3f Change-Id: I230dc79388cb8f63b866e68c2555904aa188f487