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