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

Change-Id: I5f4fd18c2e4b146b4c3c6a59da54462a13160b96


Trivial merge