tree 8a0c14f1bf8c3f312fad6ee54263dd4bedd9fc38
parent 78c2ddb715a367f6859e1421d2b86df91b12d4e8
parent 0bf474261dc5656990ecc25af63f3b2d125b2b20
author Andreas Huber <andih@google.com> 1336686292 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336686292 -0700

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

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