tree 47d13e256ed308eafc7815179266b73835c6e770
parent 06fe8f1452a68cc4634c80616aadfac42ccd1ddb
parent b1ccb623d9db42c451aa9dd4e8cf0e76b164aa50
author Andreas Huber <andih@google.com> 1273510571 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273510571 -0700

am 23796f1e: am 248597ae: am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo