tree 104ff11f3a4d220f6da0d61b5e06246e5a29acf2
parent 8778ae2ffce05417a51b503a3d6a904a228f2a02
parent 054fbe7829d1bfad41e73e17ad54f25b2a939f3e
author Dave Sparks <davidsparks@android.com> 1260496630 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260496630 -0800

am 14f89404: Fix media player decode function. Bug 2317821.

Merge commit '14f8940472217e8b0164d8f213679710d623d528' into eclair-mr2

* commit '14f8940472217e8b0164d8f213679710d623d528':
  Fix media player decode function. Bug 2317821.