am e292086: Merge change 1391 into donut

Merge commit 'e292086e6b5124a8e6b9435609d41c9ab2ef5e22'

* commit 'e292086e6b5124a8e6b9435609d41c9ab2ef5e22':
  Fix 1799207. With the new local dns, we should allow the host without any PERIOD. Otherwise http://go won't work properly.

core/java/android/webkit/CookieManager.java

@@ -647,8 +647,6 @@ public final class CookieManager {
                     // another file in the local web server directory. Still
                     // "localhost" is the best pseudo domain name.
                     ret[0] = "localhost";
-                } else if (!ret[0].equals("localhost")) {
-                    return null;
                 }
             } else if (index == ret[0].lastIndexOf(PERIOD)) {
                 // cookie host must have at least two periods