| commit | 1da297f9f1fca52d02d09733198e4f3849782c34 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Apr 04 16:20:27 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 04 16:20:27 2013 -0700 |
| tree | a2d85abee43a6e35e1da91360209fa70a9d0eea7 | |
| parent | 5cb91a722a43abdcb02ea5345cc0ac6b1089561e [diff] | |
| parent | f8fae863e8a5d442684634a1d3b2adcbe74b957a [diff] |
am f8fae863: Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev * commit 'f8fae863e8a5d442684634a1d3b2adcbe74b957a': Make sure resume() and flush() are handled appropriately even if the codec