am 3264b251: am 39ff8149: Merge "libstagefright: fix possible overflow in...
am 3264b251: am 39ff8149: Merge "libstagefright: fix possible overflow in SampleTable.cpp" into mnc-dev
* commit '3264b251':
libstagefright: fix possible overflow in SampleTable.cpp