Increase no-data timeout to 5 seconds. am: d00b71cbc3 am: f8083c0977 am: 5e52d6630c
authorHaixia Shi <hshi@google.com>
Wed, 27 Jul 2016 22:11:21 +0000 (22:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 22:11:21 +0000 (22:11 +0000)
am: 10a0d7d015

Change-Id: I8c79ba0f3ab1bec4adf08b3dc806117c9f4c4c37


Trivial merge