am 945957de: am d0b1fac1: Merge "Make sure resume() and flush() are handled...
am 945957de: am d0b1fac1: Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
* commit '945957de':
Make sure resume() and flush() are handled appropriately even if the codec