tree 4e40e64b56eb3c8ee1d41c520e0b279ef5ff3fa8
parent a087c3fc939faca9f4ec5f1f38960336814f1191
parent a06d2eb83e22f923cece45e8c56bc04cd28cf2ab
author Ray Essick <essick@google.com> 1496783299 +0000
committer android-build-merger <android-build-merger@google.com> 1496783299 +0000

Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am: 021575025c am: 5944b611e5 am: 1a419c7b2a am: 70a63bdf27 am: 40833da7b9 am: 2ad98cf1c7 am: be560fcb1c am: b9f302c2f0 am: 1c1d3116d9 am: f7350dd989
am: a06d2eb83e

Change-Id: I67cbeed83d25ff5aa228f6f418656a3d984daf09