tree 895de6e49e5b5a24039552b0f148ea834c035ac6
parent a5091c84c38cac7e43f3fea9198fc58107d94e74
parent bb8e18154d451238394d8c8c0a800c5381f37023
author Ray Essick <essick@google.com> 1489448824 +0000
committer android-build-merger <android-build-merger@google.com> 1489448824 +0000

Merge "Fix TOCTOU problem in libstagefright_soft_aacenc" into klp-dev am: 2076915c5f am: dcda2ec2fe am: f5c7784dbd am: c3de266a99 am: 8655d4fc01 am: b05be00f56 am: eb58ce5bb0 am: a830539187 am: e973c65525 am: ae7fae1810 am: d4d9c97a9d am: b532a32912 am: e4cce73b86 am: ce559427fd
am: bb8e18154d

Change-Id: I2ccabcce8115b1b9d1ad90ab14fc7eccc2ab0c15