tree 0ac15a04125972ea69f617293223870d7e39e307
parent 2e74b159f517fccb402a75045af821702f2310af
parent e556248e859e7197d5f97c6c0724806d5913da24
author Android (Google) Code Review <android-gerrit@google.com> 1241598691 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1241598691 -0700

am e556248: Merge change 1017 into donut

Merge commit 'e556248e859e7197d5f97c6c0724806d5913da24'

* commit 'e556248e859e7197d5f97c6c0724806d5913da24':
  Changes in mediaframework test for the OpenCore 2.0 integration. Changes included: