tree 9f7e695fabcdf8f849b2be640903ae635c16a18e
parent e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7
parent 7b66f713fc53ee81453763788c02f3c741d19520
author Lajos Molnar <lajos@google.com> 1423084293 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423084293 +0000

am 7b66f713: am 57f75272: Merge "stagefright: add support for native flex-YUV formats" into lmp-mr1-dev

* commit '7b66f713fc53ee81453763788c02f3c741d19520':
  stagefright: add support for native flex-YUV formats