commit b93ae7ea24dc60e1c5d7e0139a70b9e1cb6d1425
author Andreas Huber <andih@google.com> Tue Apr 06 14:50:05 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 06 14:50:05 2010 -0700
tree 3412920b5172c4c0e3cc708649591a776b7b99ba
parent 62057cddfa2ce3afdd3b643c5171c889edd86cc1
parent 3e8b89bd8d35525019080205e7221063748a3f0a

am 3e8b89bd: am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo

Merge commit '3e8b89bd8d35525019080205e7221063748a3f0a' into kraken

* commit '3e8b89bd8d35525019080205e7221063748a3f0a':
  Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.