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

Change-Id: Icf88588b76a0dd4537872560c1229ff533b0681d


Trivial merge