tree 0c08cc8d4bfcdd7cd832aed7ef6cc559ada86a5a
parent b990a22cb5a8f6caa70e4f6be7b41561c9d8402f
parent 89b888b6c5a687f11a9005bfe133610c5dbcdc5a
author Daniel Xie <dxie@google.com> 1442945605 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442945605 +0000

am 89b888b6: am 2a6218d2: am e7918277: Merge "Should create a decoder from MediaCodecList" into lollipop-cts-dev

* commit '89b888b6c5a687f11a9005bfe133610c5dbcdc5a':