| commit | 1c6b4a4251b10f6ce96d451947d6a9b6d487e1ff | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Fri Feb 24 13:11:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 24 13:11:26 2017 +0000 |
| tree | 3561f91bec348cfb20f768789f60f7405fb8155e | |
| parent | 6fd54366d2528d7fbc80af2d710c4a6ac3ac91a9 [diff] | |
| parent | 162984694d4831b3e1324b7b708866c8be0debf1 [diff] |
Merge "Revert "TEMPORARY HACK: Set a 10 minute timeout on jack-admin commands"" am: 8c982e0824 am: 162984694d Change-Id: If768ee4f2486f4816033410355a7fde3197f52bb