tree 2054a45c7beb084011dcdba3a73eb8fa1d965334
parent 7f258f970e2123131638665c9d6674a7e1c7e4ea
parent 43c9516a29563131e04ee797562130e2c4f9d54e
author Narayan Kamath <narayan@google.com> 1392136835 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392136835 +0000

am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"

* commit '43c9516a29563131e04ee797562130e2c4f9d54e':
  Fix in MediaMuxer's JNI code