diff options
| author | John Spurlock <jspurlock@google.com> | 2014-01-14 19:57:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-14 19:57:02 +0000 |
| commit | cce06eda6bd6af957b261f66eb8ea3623fe09caf (patch) | |
| tree | ef0bbdd628ffe64d273674167726567476f8ebe4 /core/java/android/widget/PopupWindow.java | |
| parent | 82ec09547423f7166e271226825ddd686cbab8cb (diff) | |
| parent | b34363590953e4efd70168cdf03386d1e469a548 (diff) | |
am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
* commit 'b34363590953e4efd70168cdf03386d1e469a548':
Docfixes: three typos and escape */*.
Diffstat (limited to 'core/java/android/widget/PopupWindow.java')
| -rw-r--r-- | core/java/android/widget/PopupWindow.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index 5663959bdfe3..be20d2d836f8 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -1330,7 +1330,7 @@ public class PopupWindow { /** * Updates the state of the popup window, if it is currently being displayed, - * from the currently set state. This include: + * from the currently set state. This includes: * {@link #setClippingEnabled(boolean)}, {@link #setFocusable(boolean)}, * {@link #setIgnoreCheekPress()}, {@link #setInputMethodMode(int)}, * {@link #setTouchable(boolean)}, and {@link #setAnimationStyle(int)}. |