am 65dfac3b: Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev

* commit '65dfac3bb5e1da2b4b84724cb7e39b47957ece4c':
  Clean up JavaDoc for CookieManager

core/java/android/webkit/CookieManager.java

@@ -37,8 +37,8 @@ public class CookieManager {
     /**
      * Gets the singleton CookieManager instance. If this method is used
      * before the application instantiates a {@link WebView} instance,
-     * {@link CookieSyncManager#createInstance(Context)} must be called
-     * first.
+     * {@link CookieSyncManager#createInstance CookieSyncManager.createInstance(Context)}
+     * must be called first.
      *
      * @return the singleton CookieManager instance
      */

core/java/android/webkit/WebView.java

@@ -164,10 +164,7 @@ import java.util.Map;
  *
  * <p>For obvious security reasons, your application has its own
  * cache, cookie store etc.&mdash;it does not share the Browser
- * application's data. Cookies are managed on a separate thread, so
- * operations like index building don't block the UI
- * thread. Follow the instructions in {@link android.webkit.CookieSyncManager}
- * if you want to use cookies in your application.
+ * application's data.
  * </p>
  *
  * <p>By default, requests by the HTML to open new windows are