OSDN Git Service

Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am...
authorMarco Nelissen <marcone@google.com>
Wed, 21 Sep 2016 20:59:18 +0000 (20:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 20:59:18 +0000 (20:59 +0000)
commit9668a1012a5d0d17dde317b32946bc6e421ad6a9
tree870dd544afdd2ea0f206285e67bc00ea3b85d3d4
parentfbd7146fcc76f8753c4b309d795ab37a9c4be3e6
parent7d5774b0ea9ddaf316b0b75e6e4fd9fe3dd72030
Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb am: 085a4173eb am: b617cbed2d am: f5b8755f18
am: 7d5774b0ea

Change-Id: I1928b55d24e9ed5023af5d68762e1c846388ee62