tree 6e937ef64a19e11b71ea6ba6e1c6900086378950
parent 9b423a82d823f3516fcd969ac2cbc6c04e04e281
parent 32130c6d092223ba91ab4425fe2c40e9e6fde584
author Siva Velusamy <vsiva@google.com> 1348264932 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348264932 -0700

am 32130c6d: Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev

* commit '32130c6d092223ba91ab4425fe2c40e9e6fde584':
  Include videoeditor_jni in sdk product build.