tree 8a0c14f1bf8c3f312fad6ee54263dd4bedd9fc38
parent ddebe415450d1fba7a9cb1972f279621d6784c32
parent af9e6a17d7038b411b61a3cb0669694058511a05
author Andreas Huber <andih@google.com> 1336686105 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336686105 -0700

am af9e6a17: Merge "Properly connect/disconnect to/from the native window in MediaCodec." into jb-dev

* commit 'af9e6a17d7038b411b61a3cb0669694058511a05':
  Properly connect/disconnect to/from the native window in MediaCodec.