tree 5bdaa2f0d79958f69b3f76172ed3b4ffa1d394a5
parent 4d1b114b5f83eeb645aefa41d76f7400a5dfa59b
parent 91fe746437e1709b83b4eb4d113e5f435d7c6412
author Chia-chi Yeh <chiachi@android.com> 1282791724 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282791724 -0700

am 91fe7464: am 14e00621: Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread

Merge commit '91fe746437e1709b83b4eb4d113e5f435d7c6412'

* commit '91fe746437e1709b83b4eb4d113e5f435d7c6412':
  Revert "RTP: integrate the echo canceller from speex."