tree a93c60f4a35ccf51beed0fac093e331f3057bd83
parent 6d8f3b8240d8b16c4dd2370e3fee158d66cb876c
parent feecaecca15dbd5fa5bada81296692b8363f8332
author Ray Essick <essick@google.com> 1496784039 +0000
committer android-build-merger <android-build-merger@google.com> 1496784039 +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

Change-Id: I4685f12d40a5a2afc46f54fa26308961866c5239