OSDN Git Service

Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc
authorMarco Nelissen <marcone@google.com>
Wed, 21 Sep 2016 20:41:43 +0000 (20:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 20:41:43 +0000 (20:41 +0000)
am: 3fb9e5b7cb

Change-Id: Ibcb0e44db0ff0da658af399522266606171b6a2e


Trivial merge