tree c8713019fc9e7d63b5c53e8e7a1aeb04b773bef1
parent 7ccacce12a9408780a1f8b68999d8dcee06300cd
parent 785d9bf0b2b9df46a89b21ab777614d152808a74
author Wonsik Kim <wonsik@google.com> 1470090715 +0000
committer android-build-merger <android-build-merger@google.com> 1470090715 +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 am: c8b94e7b83
am: 785d9bf0b2

Change-Id: I3363d1c06add9eed30b7b06a5c15a0573e5f4904