tree 713706e3b687bb494c536ef68d1314634302de9f
parent b9a541465d394ecc9a87832f812e13ae1a491154
parent 3e875c38918ea5a37c73b084a4b29efcb0d143f5
author Romain Guy <romainguy@android.com> 1307635435 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307635435 -0700

am 34e9f249: am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."

* commit '34e9f249a9b36ebe64476b997bca0edf990fbc0d':
  Disable plugins if setPluginsEnabled(false) called.