| commit | 6c5a8e05265996a0eeb82aaaebdaa3347ec7389c | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 27 14:17:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:17:43 2015 +0000 |
| tree | 3afa17a64581c4f6d7cb596fcae18b2bf7c3d029 | |
| parent | 8ada993c08800596cb0993ea98678feb1d463fdd [diff] | |
| parent | e17b27938225d9cbcfad70ca3b475449a9589b8d [diff] |
am e17b2793: am 8c2c86f6: (-s ours) am fe2bfd39: Merge "Decoder: Reduced memory requirements" * commit 'e17b27938225d9cbcfad70ca3b475449a9589b8d':