| commit | 4486cbb521c0aac3fcb6229502d3fbfda3e2aedb | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Sep 21 21:15:30 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 21 21:15:30 2016 +0000 |
| tree | 85171b2248cafe5a0b7647d5c74cf2938ea898e1 | |
| parent | d5ec68c375a8d0b26d9b0f923a604a2e2629d851 [diff] | |
| parent | 890b0db1591774de32aead55d8670afe79674494 [diff] |
Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb am: 085a4173eb am: b617cbed2d am: f5b8755f18 am: 7d5774b0ea am: 9668a1012a am: b87e75a6bf am: 61b8e13fdd am: f160b4781a am: 04180a9fa8 am: 890b0db159 Change-Id: I33942c20da7bf295df02255a45d4270d087f7f44