summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-12-06 19:00:22 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-06 19:00:22 -0800
commitb38ecce234b0ab32a33f8f65d4f7b1b6f13006cd (patch)
tree3c00ace6a64a1c57d2acd1d18641327341328086
parentb93762809beb13f61c6b2f7cb908a4ce81f46c82 (diff)
parent40ddc2bf4062caf5ce64cff69b697a874802ad9a (diff)
downloadframeworks_base-b38ecce234b0ab32a33f8f65d4f7b1b6f13006cd.zip
frameworks_base-b38ecce234b0ab32a33f8f65d4f7b1b6f13006cd.tar.gz
frameworks_base-b38ecce234b0ab32a33f8f65d4f7b1b6f13006cd.tar.bz2
am 40ddc2bf: am bc305e55: Merge "Fix longstanding nonsense in javadocs." into jb-mr1.1-dev
* commit '40ddc2bf4062caf5ce64cff69b697a874802ad9a': Fix longstanding nonsense in javadocs.
-rw-r--r--core/java/android/app/Notification.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 8f8df0a..3f8e16c 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -322,7 +322,7 @@ public class Notification implements Parcelable
/**
* Bit to be bitwise-ored into the {@link #flags} field that should be
* set if the notification should be canceled when it is clicked by the
- * user. On tablets, the
+ * user.
*/
public static final int FLAG_AUTO_CANCEL = 0x00000010;