OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60d9dfc 5301a56)
am 5301a56c: Merge "Revert "Remove dependency of libvideoeditor_jni.so on static...
authorJames Dong <jdong@google.com>
Tue, 15 May 2012 21:56:23 +0000 (14:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 May 2012 21:56:23 +0000 (14:56 -0700)
* commit '5301a56cc38b8558d88220968880cc0381469ed2':
  Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help