commit | 3ba58256ea9da46367680a9b63d9e5313fd685d3 | [log] [tgz] |
---|---|---|
author | Nicolas Geoffray <ngeoffray@google.com> | Mon Dec 05 11:23:06 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Dec 05 11:23:06 2016 +0000 |
tree | df18bf0988bafc52129bf39681be7594634f11af | |
parent | 012a54c86dd3cf5869f7a8ef1c3792b66bc79f45 [diff] | |
parent | 3d32bf0b1e9469ffcb7fd7793d56d0193e1d5d5c [diff] |
Merge "Don't use an internal timeout, rely on the test harness one." am: 3d32bf0b1e Change-Id: Ib30b33778da6d4d27f3c98ff0c6f22b86ce566c3