tree a8631188c4385d4f3876db0a3aa8ea21dea76c8e
parent 3e1e0d79887f8777aced8faca207e04cb6ec1f86
parent fd1fe13b4584628d73df31717794e8e886d6bc39
author James Dong <jdong@google.com> 1261239963 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261239963 -0800

am 4e4795c8: Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable

Merge commit '4e4795c8c0934eb063048471037ecb8a713e85fd' into eclair-mr2-plus-aosp

* commit '4e4795c8c0934eb063048471037ecb8a713e85fd':
  Fix a memory corruption problem in software M4v/H263 decoder due to out-of-scope local variable