tree 8928ea9f3f6923bfacd0f521b30d7ec927a1891c
parent 88dca7fc169c57a545556c45efd5511eff504dbc
parent d0229c9ae703504cf145e8ef92c97702dbc6963b
author Andreas Huber <andih@google.com> 1366647565 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366647565 -0700

am f0fba380: Merge "A flush of a video decoder connected to a native window must reclaim" into jb-mr2-dev

* commit 'f0fba38005f16b94b89a512fde0e01511d97e304':
  A flush of a video decoder connected to a native window must reclaim