Increase no-data timeout to 5 seconds. am: d00b71cbc3 am: a7afa30111
authorHaixia Shi <hshi@google.com>
Thu, 25 Aug 2016 22:29:38 +0000 (22:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 22:29:38 +0000 (22:29 +0000)
am: dbeebd4714

Change-Id: I86f6af5a7cee3391c06e020b3f8a9a8d0eef768f


Trivial merge