tree fc32430a4fc66bcbca240e623c59381d9e12d56a
parent 661c21da5592ca48256747ec220efb2e599eeb72
parent 58344bc9165a9465a63acc874f3e71251a0d7f50
author Marco Nelissen <marcone@google.com> 1414099857 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414099858 +0000

Merge "64 bit fixes for NdkMediaExtractor" into lmp-dev