OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9a5414 3e875c3)
am 34e9f249: am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled...
authorRomain Guy <romainguy@android.com>
Thu, 9 Jun 2011 16:03:55 +0000 (09:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jun 2011 16:03:55 +0000 (09:03 -0700)
* commit '34e9f249a9b36ebe64476b997bca0edf990fbc0d':
  Disable plugins if setPluginsEnabled(false) called.


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