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

Change-Id: I079ecec07a8ec169a0fa974a87fa3fb2438c71a9


Trivial merge