summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit
diff options
context:
space:
mode:
authorIgnacio Solla <igsolla@google.com>2014-11-13 00:00:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-13 00:00:15 +0000
commitd48fe730631d0f835e072c07faef9381ba376c4e (patch)
tree7561ae596084b4f5e5c4e99540f78ca84a28da3b /core/java/android/webkit
parentebb526e976a576ea5a13c61fe34a3d533e367d8e (diff)
parent4fc66e582ac25c875e3131ca055daeddc284387f (diff)
downloadframeworks_base-d48fe730631d0f835e072c07faef9381ba376c4e.zip
frameworks_base-d48fe730631d0f835e072c07faef9381ba376c4e.tar.gz
frameworks_base-d48fe730631d0f835e072c07faef9381ba376c4e.tar.bz2
am 4fc66e58: am ba1d4cd4: am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev
* commit '4fc66e582ac25c875e3131ca055daeddc284387f': Fix docs build breakage
Diffstat (limited to 'core/java/android/webkit')
-rw-r--r--core/java/android/webkit/WebViewDelegate.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewDelegate.java b/core/java/android/webkit/WebViewDelegate.java
index 18b6425..c878b3d 100644
--- a/core/java/android/webkit/WebViewDelegate.java
+++ b/core/java/android/webkit/WebViewDelegate.java
@@ -97,7 +97,7 @@ public final class WebViewDelegate {
* @param canvas a hardware accelerated canvas (see {@link Canvas#isHardwareAccelerated()})
* @param nativeDrawGLFunctor the pointer to the native functor that implements
* system/core/include/utils/Functor.h
- * @throw IllegalArgumentException if the canvas is not hardware accelerated
+ * @throws IllegalArgumentException if the canvas is not hardware accelerated
*/
public void callDrawGlFunction(Canvas canvas, long nativeDrawGLFunctor) {
if (!(canvas instanceof HardwareCanvas)) {