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