tree ddcb710c06074f2b44b86d6686c5e26a27e1f7cc
parent 20ffad4da71550cf0cacbb26679990258f1561e2
parent 5e691cd3aed18b79cc7362b6689f67886ce90e56
author Andreas Huber <andih@google.com> 1364494871 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1364494871 +0000

Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev