| commit | 48948e10b33b578a6ac405a15740f72574b54a2b | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Sat Jan 10 02:14:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 10 02:14:29 2015 +0000 |
| tree | 1cc081936c58866df47340584596a2df14402943 | |
| parent | 2a41b761866f12f67fdf50efb76dd72e403ff1c2 [diff] | |
| parent | f3694fc139525ae45955087a0e4f15a15ed6e202 [diff] |
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