commit | a1ec0bcec59a7dbd2447c1375c6d0e1df85249c0 | [log] [tgz] |
---|---|---|
author | Lajos Molnar <lajos@google.com> | Sat Jan 10 02:22:51 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 10 02:22:51 2015 +0000 |
tree | c23281d5ef96088026eae670f6d860a4417d38b8 | |
parent | 7c9512cb2d94a108d87d7b0015a9b90df00dd612 [diff] | |
parent | 48948e10b33b578a6ac405a15740f72574b54a2b [diff] |
am 48948e10: am f3694fc1: am 98840f2b: Merge "media: add support for 160-byte image info in MediaCodec" * commit '48948e10b33b578a6ac405a15740f72574b54a2b': media: add support for 160-byte image info in MediaCodec