tree ed855078c90054b870b6effb1b1ea9f82f1fb200
parent c2e89d246e7c6e759474da3e8d5eb9c48912ac04
parent e7f1b6dd9c398dd948934920affc633e224dfd79
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.