| commit | 05fee7bddba9a00ed33392e78fddefbebf79b0b4 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Tue Jun 12 14:22:59 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 12 14:22:59 2012 -0700 |
| tree | 4daf5f5898cc3383963379254a29285250821eb2 | |
| parent | 4d3448db54e274b8c5f10ddef204882320e631ec [diff] | |
| parent | 085c4825897bbbfa0f8564c2de45f74d7bea4029 [diff] |
am 085c4825: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb-dev * commit '085c4825897bbbfa0f8564c2de45f74d7bea4029': Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so