tree fb1820a8bf0e6312db4a538fbd7c018714c80bfc
parent 265bffa901049f55f28ae1dbb414cb66276f726b
parent 0f7c543cc48d287591b5638a15bf8ca977e162a2
author Andreas Huber <andih@google.com> 1270242864 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1270242864 -0700

am 0f7c543c: am eb6e3edc: Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo

Merge commit '0f7c543cc48d287591b5638a15bf8ca977e162a2' into kraken

* commit '0f7c543cc48d287591b5638a15bf8ca977e162a2':
  Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly.