tree 9908d1f33c45f6161cd1cefbc327b7298dc00d70
parent 1de65a91b9d174b26b594073eb1ee0dcccb31819
parent 7e7013392e302a28364df1dcee79b82ad90978b4
author Andreas Huber <andih@google.com> 1366407576 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366407577 +0000

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