tree 10213053e7bfce5cf09ec26f36ecdcf78e9fae5a
parent 3b72d24df4d78b63622937a4d20776b5f46304a6
parent 589bee39de9b6b7450f43c9e61f7b0393772f4ac
author Marco Nelissen <marcone@google.com> 1366125778 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366125778 -0700

am 589bee39: am 94b66227: Fix Vorbis decoder reset

* commit '589bee39de9b6b7450f43c9e61f7b0393772f4ac':
  Fix Vorbis decoder reset