summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-05-28 09:36:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-28 09:36:19 -0700
commitbe7a7e546f409442c2f6505dd7a0526553fa395c (patch)
treeaa93b1b38c760c2cd209629457c80bd739c04c20 /core
parent1a4022c8a625436e00fb3174b287c33dd85a45be (diff)
parentee352cca1f3beb577dfdf1c18a08242e4f94d01b (diff)
downloadframeworks_base-be7a7e546f409442c2f6505dd7a0526553fa395c.zip
frameworks_base-be7a7e546f409442c2f6505dd7a0526553fa395c.tar.gz
frameworks_base-be7a7e546f409442c2f6505dd7a0526553fa395c.tar.bz2
am ee352cca: Merge "Fix typo in View.java javadocs" into jb-mr2-dev
* commit 'ee352cca1f3beb577dfdf1c18a08242e4f94d01b': Fix typo in View.java javadocs
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/View.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index d67c49f..5e89435 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -15915,7 +15915,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
}
/**
- * <p>This mehod must be called by {@link #onMeasure(int, int)} to store the
+ * <p>This method must be called by {@link #onMeasure(int, int)} to store the
* measured width and measured height. Failing to do so will trigger an
* exception at measurement time.</p>
*