tree 782ac6869f65b302f29f9e78b99fc75aefef99a9
parent f5c7784dbd3de07e4e16da74b6c63e219c508d3f
parent 8e3cf4d841a99c558d9ae3072eb7094cabce14ad
author Ray Essick <essick@google.com> 1489445290 +0000
committer android-build-merger <android-build-merger@google.com> 1489445290 +0000

Merge "Add bounds check in SoftAACEncoder2::onQueueFilled()" into klp-dev am: 19b91af752
am: 8e3cf4d841

Change-Id: I804c61a21202d3c5aef3edac5872f56cef67753b