summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2010-06-22 11:08:40 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-06-22 11:08:40 -0700
commitef730e6ececa96a3e0576140eea707f7c48cd66c (patch)
tree3f0033ff4199d9287687315ad2dfcbf9c3e4027d
parentef1c48d6a976f56bf7f7a41a5b2e8725af988362 (diff)
parent8091ca5015b2a9f591ad7d3ee5ec832c16cf5548 (diff)
downloadframeworks_base-ef730e6ececa96a3e0576140eea707f7c48cd66c.zip
frameworks_base-ef730e6ececa96a3e0576140eea707f7c48cd66c.tar.gz
frameworks_base-ef730e6ececa96a3e0576140eea707f7c48cd66c.tar.bz2
Merge "Fix javadocs." into gingerbread
-rw-r--r--core/java/android/content/pm/ActivityInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java
index 00f19df..364c91e 100644
--- a/core/java/android/content/pm/ActivityInfo.java
+++ b/core/java/android/content/pm/ActivityInfo.java
@@ -156,7 +156,7 @@ public class ActivityInfo extends ComponentInfo
* {@link android.view.WindowManager.LayoutParams#FLAG_FULLSCREEN}
* may still be interrupted by high-priority notifications; for example, an
* incoming phone call may use
- * {@link * android.app.Notification#fullScreenIntent fullScreenIntent}
+ * {@link android.app.Notification#fullScreenIntent fullScreenIntent}
* to present a full-screen in-call activity to the user, pausing the
* current activity as a side-effect. An activity with
* {@link #FLAG_IMMERSIVE} set, however, will not be interrupted; the