| commit | f55bae06e0423dc5d13739c3f34767eb4d810794 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Sep 21 21:19:34 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 21 21:19:34 2016 +0000 |
| tree | 1f0a1b2deed447f4476eff71bce26755ee454258 | |
| parent | a6836b5e6d063f5fef8a182c64674bf94de3091f [diff] | |
| parent | 4486cbb521c0aac3fcb6229502d3fbfda3e2aedb [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 am: 4486cbb521 Change-Id: I7ab8205aff7b25cc5a1cb2cf328a94b1856e7478