am 416bfd60: am 9ca7d0c2: Merge change 24460 into eclair

Merge commit '416bfd60ee45716eda1e24b0c95fe7b162accb2e'

* commit '416bfd60ee45716eda1e24b0c95fe7b162accb2e':
  The empty path and no path mean default path. So "a=d" should replace "a=c".

tests/CoreTests/android/webkit/CookieTest.java

@@ -188,6 +188,6 @@ public class CookieTest extends AndroidTestCase {
 
         mCookieManager.setCookie(url, "a=d");
         cookie = mCookieManager.getCookie(url + "/wee");
-        assertTrue(cookie.equals("a=b; a=c; a=d"));
+        assertTrue(cookie.equals("a=b; a=d"));
     }
 }