Merge "Fix build warning due to WebSettings now being abstract" into jb-dev

Steve Block · Android (Google) Code Review · commit 886f138dfe38 · 2012-04-27T11:09:41.000-07:00
diff --git a/api/16.txt b/api/16.txt
@@ -24979,7 +24979,7 @@ package android.webkit {
     method public void setMimeType(java.lang.String);
   }
 
-  public class WebSettings {
+  public abstract class WebSettings {
     method public boolean enableSmoothTransition();
     method public boolean getAllowContentAccess();
     method public boolean getAllowFileAccess();

Original file line number	Diff line number	Diff line change
`@@ -24979,7 +24979,7 @@ package android.webkit {`
`24979`	`24979`	`method public void setMimeType(java.lang.String);`
`24980`	`24980`	`}`
`24981`	`24981`
`24982`		`- public class WebSettings {`
	`24982`	`+ public abstract class WebSettings {`
`24983`	`24983`	`method public boolean enableSmoothTransition();`
`24984`	`24984`	`method public boolean getAllowContentAccess();`
`24985`	`24985`	`method public boolean getAllowFileAccess();`