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

Change-Id: I6613e5da70a72e19fafb82ee3252681579c76237


Trivial merge