commit | 501a17e5367d2e733819c623d16970cfd7321133 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Wed Sep 21 23:26:43 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 21 23:26:43 2016 +0000 |
tree | 4b5745f0dec676a85ef2b5ef2ce8a921c95cc1db | |
parent | c22a70934bf68f8b9d720427e3a83b6dbe9062fe [diff] | |
parent | 4d678fa2d394c1d33663b29feadf2c98ec853617 [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 am: f55bae06e0 am: fddfa51a56 am: 4d678fa2d3 Change-Id: Ic7ffe982fcac2cb5bfc9bf926e7a89c6ff87f4f6