Merge "Deprecate various WebView related methods" into jb-mr2-dev

author Jonathan Dixon <joth@google.com>

Thu, 28 Feb 2013 22:11:36 +0000 (22:11 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 28 Feb 2013 22:11:36 +0000 (22:11 +0000)
author Jonathan Dixon <joth@google.com>
Thu, 28 Feb 2013 22:11:36 +0000 (22:11 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 28 Feb 2013 22:11:36 +0000 (22:11 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/webkit/WebView.java
Simple merge
author	Jonathan Dixon <joth@google.com>
	Thu, 28 Feb 2013 22:11:36 +0000 (22:11 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 28 Feb 2013 22:11:36 +0000 (22:11 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/webkit/WebView.java	patch \|	diff1 \|	diff2 \|	blob \| history