OSDN Git Service

am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
authorRomain Guy <romainguy@android.com>
Tue, 7 Jun 2011 22:09:02 +0000 (15:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jun 2011 22:09:02 +0000 (15:09 -0700)
commit34e9f249a9b36ebe64476b997bca0edf990fbc0d
treeddc2c6aeb57081564399f9a69b6432033300967c
parent7ca13deb40ac60b88abc1d752871b124afea9169
parentfbef58faad5a31faf36294e4d160cbd148ed5458
am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."

* commit 'fbef58faad5a31faf36294e4d160cbd148ed5458':
  Disable plugins if setPluginsEnabled(false) called.
core/java/android/webkit/WebSettings.java