diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-08 13:08:43 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-09-08 13:08:43 -0700 |
| commit | 4656e69bf36d42a35c9290ab79eeb33b4cca1d5c (patch) | |
| tree | 84c6fe3c5e58781c54ce34961d9152d370919dae /core/java/android/text/Html.java | |
| parent | 8268ad6779c38fb67ea3783fd57bf71bb0cccc51 (diff) | |
| parent | 2008cff73bbc816f867dac0cd057899bed714356 (diff) | |
resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
Diffstat (limited to 'core/java/android/text/Html.java')
| -rw-r--r-- | core/java/android/text/Html.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/Html.java b/core/java/android/text/Html.java index 2fcc59731480..dc93bc2cb0ea 100644 --- a/core/java/android/text/Html.java +++ b/core/java/android/text/Html.java @@ -61,7 +61,7 @@ public class Html { */ public static interface ImageGetter { /** - * This methos is called when the HTML parser encounters an + * This method is called when the HTML parser encounters an * <img> tag. The <code>source</code> argument is the * string from the "src" attribute; the return value should be * a Drawable representation of the image or <code>null</code> |