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

Change-Id: If77918d751d8c3db0a5475704846172eb7dd23ff


Trivial merge