tree 4e3e8bcee4dd60829301c8d615a76352016434e0
parent 5fdc249beb53ccbd3bb545bc11afa2486f405328
parent a84f54198531a996900020cf1b7af247e2f048e9
author Ray Essick <essick@google.com> 1496784838 +0000
committer android-build-merger <android-build-merger@google.com> 1496784838 +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 am: ce15503bf9 am: 6ff81f0096 am: feecaecca1 am: fde4cbba53
am: a84f541985

Change-Id: Ifda1108b444558ec4196c93b6a0dd6238d84a1ef