tree dbdee54e6652824d9b1d0be58fab954999ad2b95
parent dce5754bb24b8af908eb49338f84fcafd52ebd3b
parent 8c94827148cb1c09563a22947bcf92681b7688fa
author Daniel Xie <dxie@google.com> 1437781501 +0000
committer android-build-merger <android-build-merger@google.com> 1437781501 +0000

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

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