am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a...
am 1d7a8b44: Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
Merge commit '1d7a8b44' into froyo-plus-aosp
* commit '1d7a8b44':
Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.