tree aabc915b2771aa14c6c9a40f5ed6c5faa70a9cd9
parent 60a5ad8be71eafaab742b88972b2526f6a71911d
parent afdd49fa24762f70ad93fc72be5bac18ee0ee230
author Andreas Huber <andih@google.com> 1260575099 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260575099 -0800

am 08945576: Merge change I9ac0777e into eclair-mr2

Merge commit '089455760c05289c1315268a6cb896577ceebc64' into eclair-mr2-plus-aosp

* commit '089455760c05289c1315268a6cb896577ceebc64':
  Initial checkin of software AMR NB encoder based on PV source code.