Skip to content
Commit 0c0c037a authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Make AmrInputStream use MediaCodec" am: 86665826 am: 618c1a9a am: fd91fcc9 

am: 43cbb6bd  -s ours

Change-Id: Ia09fc733808e2f763675806a3469bfe8aec78d0d
parents a68684d6 43cbb6bd
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment