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: 3afdb5f0fc

Change-Id: I9afa846e7e346d16fd90e77f6a53f9e3454f2b5c


Trivial merge