| commit | 299a994f4039a4abc8d2f2d983eb94f27c6a618e | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 20:53:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:53:55 2015 +0000 |
| tree | 0fe003ba0d24a69430cffa048f11766abc81bc61 | |
| parent | d3c7856253b865b9fd5a3b8be53cf34c2431ad3c [diff] | |
| parent | 83f51c6ea1f21b04af7ea7803c24d547df113a80 [diff] |
am 83f51c6e: am 6b047a3c: am 6cf0ec54: am 01173cb8: am 7acc9e66: am 201ba877: am 56d5cd90: am 02c406cf: am 8c948271: Merge "increase wait timeout and reduce dequeue buffer time-out" into kitkat-cts-dev automerge: dcf21f4 -s ours * commit '83f51c6ea1f21b04af7ea7803c24d547df113a80':