commit 8970fe287e798d543c0ac9aff2e076ba6ba4746e
author The Android Automerger <android-build@android.com> Wed Apr 10 05:56:57 2013 -0700
committer The Android Automerger <android-build@android.com> Wed Apr 10 05:56:57 2013 -0700
tree 890595946c44ff05f572c282bd732368ac39e970
parent 5bc2ec39a635419b4aa6435db497df1b06c648fe
parent c4ade2fd424fa39d567a5d65924fbf6b94917d80

merge in jb-mr2-release history after reset to jb-mr2-dev

api/18.txt

diff --git a/api/18.txt b/api/18.txt
index 35a2fff..55c2989 100644
--- a/api/18.txt
+++ b/api/18.txt
@@ -26869,8 +26869,6 @@
     method public synchronized int getMinimumFontSize();
     method public synchronized int getMinimumLogicalFontSize();
     method public synchronized android.webkit.WebSettings.PluginState getPluginState();
-    method public deprecated synchronized boolean getPluginsEnabled();
-    method public deprecated synchronized java.lang.String getPluginsPath();
     method public synchronized java.lang.String getSansSerifFontFamily();
     method public boolean getSaveFormData();
     method public boolean getSavePassword();
@@ -26916,8 +26914,6 @@
     method public synchronized void setMinimumLogicalFontSize(int);
     method public void setNeedInitialFocus(boolean);
     method public synchronized void setPluginState(android.webkit.WebSettings.PluginState);
-    method public deprecated synchronized void setPluginsEnabled(boolean);
-    method public deprecated synchronized void setPluginsPath(java.lang.String);
     method public synchronized void setRenderPriority(android.webkit.WebSettings.RenderPriority);
     method public synchronized void setSansSerifFontFamily(java.lang.String);
     method public void setSaveFormData(boolean);