Increase no-data timeout to 5 seconds. am: d00b71cbc3 am: f8083c0977 am: 5e52d6630c...
authorHaixia Shi <hshi@google.com>
Wed, 27 Jul 2016 22:31:26 +0000 (22:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jul 2016 22:31:26 +0000 (22:31 +0000)
am: 3cb59cec28

Change-Id: I388780b7dddae5b3d0bcb17c1e5da4f7c1ed4d68


Trivial merge