am 7f4d5714: am e384d75b: Merge "Fix a typo that caused the high quality...
am 7f4d5714: am e384d75b: Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
* commit '7f4d5714':
Fix a typo that caused the high quality resampler to produce garbage