tree 536ada6a8e064ff9adac72a99859ffd0bb13c916
parent ef1886ad66173d8a01903fd98c566c1b8880fcef
parent db57fae81950e32af019b32421b93d204d67e951
author Marco Nelissen <marcone@google.com> 1363298680 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363298680 +0000

am 1cea316d: Merge "Parse SBR extension sample rate" into jb-mr2-dev

* commit '1cea316d40b306f5d710175cd77c2ae4161c12e1':
  Parse SBR extension sample rate