Skip to content
Commit 48948e10 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am f3694fc1: am 98840f2b: Merge "media: add support for 160-byte image info in MediaCodec" 

* commit 'f3694fc1':
  media: add support for 160-byte image info in MediaCodec
parents 2a41b761 f3694fc1
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