tree f89509fec9d700443a5dbaddfeb5c21334ae9e24
parent 86f69c1f41dcf4e0826b17ecf7fd71eb353b0782
parent 3cf4e43cdd391502690c07e08e805aa8ff5db0c0
author Andreas Huber <andih@google.com> 1273008634 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273008634 -0700

am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo

Merge commit '8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken

* commit '8ea45aad100ee25067b2e83703454c71a968ba4f':
  Support for Ogg Vorbis decoding in stagefright.