OSDN Git Service

Merge "Don't use an internal timeout, rely on the test harness one."
authorNicolas Geoffray <ngeoffray@google.com>
Mon, 5 Dec 2016 11:23:06 +0000 (11:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 5 Dec 2016 11:23:06 +0000 (11:23 +0000)
commit3ba58256ea9da46367680a9b63d9e5313fd685d3
treedf18bf0988bafc52129bf39681be7594634f11af
parent012a54c86dd3cf5869f7a8ef1c3792b66bc79f45
parent3d32bf0b1e9469ffcb7fd7793d56d0193e1d5d5c
Merge "Don't use an internal timeout, rely on the test harness one."
am: 3d32bf0b1e

Change-Id: Ib30b33778da6d4d27f3c98ff0c6f22b86ce566c3