tree c4921b833596d2392d5fc01af36a56ca21f1b1c7
parent 7d710e1fb373d338a166560abdb90fde0c0213ef
parent 9db1b382c279f992dcd33a56226b1f5d2a24afca
author Andreas Huber <andih@google.com> 1367445007 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367445007 -0700

am 9db1b382: am deff6910: Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev

* commit '9db1b382c279f992dcd33a56226b1f5d2a24afca':
  Support MediaCodec::getOutputFormat for encoders