tree 6c87435251d1ee62c10305a136c3a593c9a4b2e1
parent 367499bc42305c511611980aecb40b8414982247
parent f7350dd9898e88c1d06145a5bd0398f4762079c0
author Ray Essick <essick@google.com> 1496783006 +0000
committer android-build-merger <android-build-merger@google.com> 1496783006 +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

Change-Id: I811d91df28a5eb49f72e0add5c58165066a50891