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

* commit 'f3694fc139525ae45955087a0e4f15a15ed6e202':
  media: add support for 160-byte image info in MediaCodec
This commit is contained in:
Lajos Molnar
2015-01-10 02:14:29 +00:00
committed by Android Git Automerger

Diff Content Not Available