tree f8f4e0a216d56d6beefc74fd72ca206aba7563c6
parent 27857361b1c2d7d876108cde5b1180d6fa66f066
parent 47e6e4e5d1fdf0737f447f09f393e9700f118b93
author Jason Parks <jparks@google.com> 1441383946 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441383946 +0000

am 47e6e4e5: am 2adc02a7: am e36ea78f: am fdfa912d: am 10a6cebf: Fix MediaCodec tests on devices without codecs.

* commit '47e6e4e5d1fdf0737f447f09f393e9700f118b93':