tree 92a1ecd68b6b926fac8bbf4c91dfccd2ff697603
parent e70b58a13dc9c3248f53dc54732499f0d5817bb2
parent 0c0e003f8e4557eb3ddb477c6adbdb3cd2ba28f4
author Andreas Huber <andih@google.com> 1336688992 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336688992 -0700

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

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