tree 9f7d64cd14d21481b0a9b7ea1d4245a60316dbf4
parent 735cb001401ab9e72ff2578e05c8d0caca2f4b04
parent 488bf2281134c549fcc9ffcec7bda9690c2d5617
author Marco Nelissen <marcone@google.com> 1365117485 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365117485 +0000

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