| commit | 4b64d21c091204d588fcd8f3dd9f7c5e84c147da | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Fri Dec 16 07:31:36 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 16 07:31:36 2011 -0800 |
| tree | 86c2ab86d5b7370000e643378ec9293b8f63adcb | |
| parent | cd5f159420b9f1121cf19fde1c295806d937ca82 [diff] | |
| parent | f96272c3cdb3c3f6177d3fcd29e597e10dc2040f [diff] |
am f96272c3: Merge "setActiveTrack and setBufferProvider can\'t fail" * commit 'f96272c3cdb3c3f6177d3fcd29e597e10dc2040f': setActiveTrack and setBufferProvider can't fail