tree 054d0ed68f64cf1e8940951138b2a53ac8062df2
parent 49fcc854d5fdc3eb3336f253e19f000d6e3e029f
parent cd8204b4a5619663a63f909af3b6dab7ba0b01bc
author Daniel Xie <dxie@google.com> 1438837852 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438837852 +0000

am cd8204b4: am e343d0a0: am 59c06496: am 4905b06e: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev automerge: dcf21f4  -s ours automerge: 8c94827

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