Merge "temporarily disable blacklisting" into jb-mr1-dev

Author: Hiroshi Lockheimer

services/java/com/android/server/location/LocationBlacklist.java

@@ -78,6 +78,7 @@ private void reloadBlacklist() {
      * (package name matches blacklist, and does not match whitelist)
      */
     public boolean isBlacklisted(String packageName) {
+        /*
         synchronized (mLock) {
             for (String black : mBlacklist) {
                 if (packageName.startsWith(black)) {
@@ -91,6 +92,7 @@ public boolean isBlacklisted(String packageName) {
                 }
             }
         }
+        */
         return false;
     }