Commit 42327041 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 3197b300: am 83a08a83: Merge "Fix various problems with NativeMediaTest CTS" into jb-mr1-dev 

* commit '3197b300':
  Fix various problems with NativeMediaTest CTS
parents 99a742ca 3197b300
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment