tree 1640131ba2b117c2369715755850bea80c2e7f95
parent 77880ae4187d92506848249585687fc9d0c0dd25
parent bb245d35b6e81d750a91815543973b0a5976352b
author Andreas Huber <andih@google.com> 1286551074 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286551074 -0700

am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread

Merge commit 'bb245d35b6e81d750a91815543973b0a5976352b' into gingerbread-plus-aosp

* commit 'bb245d35b6e81d750a91815543973b0a5976352b':
  Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.