tree 7360027c6f3585a7ffc127978bfb9ba68b14fec0
parent 11c907e6e9666ca74087a9e89b2b152491e79630
parent 1ddbb3ba343613c722c6049b7a46490ea6c44e39
author Daniel Xie <dxie@google.com> 1439336530 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439336530 +0000

am 1ddbb3ba: am bf6a2a70: am 35944a11: am 46ba1f8b: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev automerge: e791827

* commit '1ddbb3ba343613c722c6049b7a46490ea6c44e39':
  Should create a decoder from MediaCodecList