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)
am: 3d32bf0b1e

Change-Id: Ib30b33778da6d4d27f3c98ff0c6f22b86ce566c3


Trivial merge