Increase no-data timeout to 5 seconds. am: d00b71cbc3 am: a7afa30111
authorHaixia Shi <hshi@google.com>
Tue, 13 Sep 2016 19:01:32 +0000 (19:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 19:01:32 +0000 (19:01 +0000)
am: 9dfb23aeaf

Change-Id: I914a0e22ba02c64e8db152ee10ff261f47261a34


Trivial merge