tree 2cfdae60943838224ab5b82f0f9187e4662a4529
parent d206fc5664b6939c3ecc813e02f1b1177ea932f8
parent 6ff81f0096f561bc7a3c2ab9f9bfd189608f1b49
author Ray Essick <essick@google.com> 1496783778 +0000
committer android-build-merger <android-build-merger@google.com> 1496783778 +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

Change-Id: Ib118a262039d8828bffd9184cba3246a54b62bca