| commit | 85473a31d28f56eb78f7e408f4625a155ecc43f1 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Sep 21 23:26:10 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 21 23:26:10 2016 +0000 |
| tree | 4b5745f0dec676a85ef2b5ef2ce8a921c95cc1db | |
| parent | 60b2874519c362e03d0aca68ce842fbb0dbcabfa [diff] | |
| parent | 9304fc77dcb0376e2111f5b4865734eb08c1d982 [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: 1dd2c8b1ef am: 9304fc77dc Change-Id: I80fda11292270b78531b14b089b7b127298fe2c1