tree 438d11109d6a7edcd4ac2b2db31367ae8cf28ae5
parent 1d39eeea175dfbd4bd0ff5c5fb1b54f0ea454c19
parent a7a43eb6465edd68ba90c746a0c5cbf40a4b9e9c
author Wonsik Kim <wonsik@google.com> 1470089607 +0000
committer android-build-merger <android-build-merger@google.com> 1470089607 +0000

DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0
am: a7a43eb646  -s ours

Change-Id: I443f4c11ead7e5b1544fd213debfed85308a2cef