Increase no-data timeout to 5 seconds. am: d00b71cbc3 am: f8083c0977 am: 5e52d6630c...
authorHaixia Shi <hshi@google.com>
Thu, 28 Jul 2016 00:05:46 +0000 (00:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Jul 2016 00:05:46 +0000 (00:05 +0000)
am: fbd6751573

Change-Id: Iafec12259f660bfb80e63096befc566f23a08fcc


Trivial merge