| commit | bda3e66557b75c556ecd0696e200b60d2eb6231d | [log] [tgz] |
|---|---|---|
| author | Yohann Roussel <yroussel@google.com> | Fri Feb 24 13:14:02 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 24 13:14:02 2017 +0000 |
| tree | cfed946cbeb833448597588f5d403fedb73ae79a | |
| parent | 4b1a08c19fb3f2d36aa183eb14ebee543d02bcfa [diff] | |
| parent | 1c6b4a4251b10f6ce96d451947d6a9b6d487e1ff [diff] |
Merge "Revert "TEMPORARY HACK: Set a 10 minute timeout on jack-admin commands"" am: 8c982e0824 am: 162984694d am: 1c6b4a4251 Change-Id: I3fe89a327fa98cbd81e800f8ff21b83938d96c11