tree 92a1ecd68b6b926fac8bbf4c91dfccd2ff697603
parent 8ab086d0356f90bc1901d1c4e7e0687f6ac273c3
parent 96409203b4a857768e38137e88001378ad383584
author Andreas Huber <andih@google.com> 1336688759 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336688759 -0700

am 96409203: Merge "Add "support" for AMR WB comfort noise, no data and speech lost frame types" into jb-dev

* commit '96409203b4a857768e38137e88001378ad383584':
  Add "support" for AMR WB comfort noise, no data and speech lost frame types