tree a42c78bcef06cb91898d23a3521ea6d4c45df74b
parent 3aa706059b949e59be11711d8954deae850de9df
parent b278cb0afdfb3380435ba0a3ceab79e3860011bc
author Wonsik Kim <wonsik@google.com> 1470086876 +0000
committer android-build-merger <android-build-merger@google.com> 1470086876 +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

Change-Id: I2b9c4b50dd89912e8ca18a3dd80aae64a603c7ce