commit | 1dd2c8b1efa8c90e352e22ea8b105178664abf53 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Wed Sep 21 21:15:31 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Sep 21 21:15:31 2016 +0000 |
tree | 7457493f36aff28420b29cf7bee4ef5945734799 | |
parent | c44f1a9ac06e8ffe7e2b50553e30183c35ee539e [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: If954b0bda90f27af04ecf88893ebf98599342df4