am 9befde04: Merge change 21648 into eclair

Merge commit '9befde04c3efe82317bf06cb0d841752a71de62c'

* commit '9befde04c3efe82317bf06cb0d841752a71de62c':
  Remove the hack to include Gears as it is gone now.

core/java/android/webkit/PluginManager.java

@@ -147,11 +147,6 @@ public class PluginManager {
             }
             directories.add(directory);
         }
-        // hack for gears for now
-        String gears = mContext.getDir("plugins", 0).getPath();
-        if (!directories.contains(gears)) {
-            directories.add(gears);
-        }
         return directories.toArray(new String[directories.size()]);
     }