tree 55072def75b911922bbc6a460c5ab0e3a3fd16ec
parent e0e957af70a286b405b4897ea2e9c5f10d63a7d8
parent dcf21f46b4fbb9b373d43b5284c629e6a33df5ef
author Daniel Xie <dxie@google.com> 1437769292 +0000
committer android-build-merger <android-build-merger@google.com> 1437769292 +0000

Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev
automerge: dcf21f4  -s ours

* commit 'dcf21f46b4fbb9b373d43b5284c629e6a33df5ef':
  increase wait timeout and reduce dequeue buffer time-out