OSDN Git Service

Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2...
authorMarco Nelissen <marcone@google.com>
Mon, 13 Mar 2017 23:23:32 +0000 (23:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Mar 2017 23:23:32 +0000 (23:23 +0000)
commit7422dafea057df94a1bb3b49e6a81e9e9c8379af
tree7fd5f02b3d798b2fecff0053185ec0f28b64b1f8
parentd79e9c79f73611ff429112388cf912d9be29ac63
parent9305cf71d12b2a927601b2aba13325443b7ce99a
Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2c0 am: bbca2719c6 am: c2e69851ea am: 3285770d37 am: d935c7f16e am: 98ee832c7e am: 1db2ee3dbd am: 946a690f5c am: 5fef11c61a am: 3a3cc883c1 am: d218b51912
am: 9305cf71d1

Change-Id: Ica4e4d677aa87358d6d90fc4e230a62f6ef518e3
media/libstagefright/NuMediaExtractor.cpp