tree 4e878ede3111d67251f063774777e0be36ea9355
parent 8d3ae935791c97cff864fb0110a2462fc1579c16
parent 9ad6b8640028711a9a96f2d3097f7f65f8e4d1cf
author Ray Essick <essick@google.com> 1496785285 +0000
committer android-build-merger <android-build-merger@google.com> 1496785285 +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
am: 9ad6b86400

Change-Id: I416e8c8e927efa8cf8ba377d0e517c66038fc6f5