tree fb935b10fa0ac015868c8f0c3512a1b07c4c15f5
parent 500412d7887bb45a057f36e7bedc2a1c1a57f802
parent 3148acf4a8f91bb9bf6b83562c25fe53403f6c22
author Wonsik Kim <wonsik@google.com> 1470090236 +0000
committer android-build-merger <android-build-merger@google.com> 1470090236 +0000

DO NOT MERGE - stagefright: fix integer overflow error am: 2d58796ded am: 450fd950d0 am: a7a43eb646  -s ours am: 63f8141861 am: 761a18edbe am: a577e1c6ee
am: 3148acf4a8  -s ours

Change-Id: I862f27e124e75c463239830b3f826c53ecd7a9b0