commit | 6b647eefdbd2528b3fba8ab11d561fe66b872095 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Thu Sep 22 03:13:24 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Sep 22 03:13:24 2016 +0000 |
tree | ca955ac62dbeceae5ac56c5a1544417db1aace20 | |
parent | 1a5fab2b66671f26d6c7bd7dc7d6e972f0219e3e [diff] | |
parent | d8338dd2d147c662f12134b70cc580ea4a89cc5a [diff] |
Merge "Limit mp4 atom size to something reasonable" into nyc-mr1-dev am: 08e1f41731 am: d8338dd2d1 Change-Id: Ieb65b25e22b70282198e8657f495bb504a3d0b47