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

Change-Id: I266bd1f6e320f0f3b90d8844e72676aee5688ac9


Trivial merge