tree 7012f61a8f59a1f7b1ffe9d52de7ce6f80b997e1
parent 4cabbef8266c909997cf608d008920f5a2f49937
parent c6693f6fee01f0694230c0078f5a2136f99c380e
author James Dong <jdong@google.com> 1339536031 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339536031 -0700

Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb-dev