tree f74080e75a3a85d0a3536a3ece2c772697ab38b7
parent b8eb299886a0f85bd9d44c9bf2f30488d9394b67
parent ce15503bf97ce997cd1749a346cd372174fa2659
author Ray Essick <essick@google.com> 1496783540 +0000
committer android-build-merger <android-build-merger@google.com> 1496783540 +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

Change-Id: I7ebfe4251b74d1268624fdad16c13b2c329d2ddf