tree f6d22add3ec8b6ab6451fb6fb02abb5f5750ae9b
parent c2038edcae19abc2eb8df974b1ada7993b437918
parent fde4cbba53d8396832b8099c8f6cfcdc2796b1be
author Ray Essick <essick@google.com> 1496784386 +0000
committer android-build-merger <android-build-merger@google.com> 1496784386 +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

Change-Id: Ie7271767369a4a12995ce92be3933731e2e51f69