tree 0f9a7837de9f1ebabb1c0f7b88fc0a2e73e4ab59
parent 82a7b7796756dbb757915f67a9c4da89b9fdd6f1
parent 9f3de404940bfa95bcb23fdf4d21f7ae483f8757
author Wonsik Kim <wonsik@google.com> 1470087444 +0000
committer android-build-merger <android-build-merger@google.com> 1470087444 +0000

DO NOT MERGE - stagefright: fix integer overflow error am: f4f36a0a31  -s ours am: 4efaa1bca7 am: ac9dd1421d am: 4f4d793ecb  -s ours am: b017233d05 am: 26cf54f35a am: b278cb0afd am: fbab974cd3  -s ours
am: 9f3de40494

Change-Id: I6acc30e2953beebe0463e323125fed5c40ea2c7c