Increase no-data timeout to 5 seconds. am: d00b71cbc3 am: f8083c0977 am: 5e52d6630c...
authorHaixia Shi <hshi@google.com>
Wed, 27 Jul 2016 23:00:14 +0000 (23:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 23:00:14 +0000 (23:00 +0000)
am: c82316692f

Change-Id: I4012302cfb16f0a044f13435335c176cf725dc89


Trivial merge