tree 536c986f511fd52d15348b02458a815e184b42cf
parent e1aa23308048da5f2f9902b99b28fad281725011
parent de6bf9cc0fd94452ffcd6685e1469092db74a454
author Andreas Huber <andih@google.com> 1367529590 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367529590 -0700

am de6bf9cc: Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev

* commit 'de6bf9cc0fd94452ffcd6685e1469092db74a454':
  Fix miracast source code to ignore the encoder output format change