diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-04 01:57:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-04 01:57:47 +0000 |
| commit | 4c4b1d65ff65ec2a6b45047ff24284989dbeb8b7 (patch) | |
| tree | d10bfb60daa26a6b22f817a5ef86143cd56fd142 /core | |
| parent | 8d0c89ad16193e98c7a96f13d8f03a05e75a0f4a (diff) | |
| parent | 529a43f7194958178055313254cc43a4f73f58b9 (diff) | |
| download | frameworks_base-4c4b1d65ff65ec2a6b45047ff24284989dbeb8b7.zip frameworks_base-4c4b1d65ff65ec2a6b45047ff24284989dbeb8b7.tar.gz frameworks_base-4c4b1d65ff65ec2a6b45047ff24284989dbeb8b7.tar.bz2 | |
Merge "Fix build due to bad javadoc link."
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 23caccc..20e7311 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -4707,9 +4707,7 @@ public class Activity extends ContextThemeWrapper * found with either a non-null label or a non-null icon set by this call the traversal is * ended. For each task those values will be returned in {@link * ActivityManager.RecentTaskInfo#activityLabel} and {@link - * ActivityManager.RecentTaskInfo#activityIcon}. The {link Intent} for the activity that set - * activityLabel and activityIcon will be returned in {@link - * ActivityManager.RecentTaskInfo#activityIntent} + * ActivityManager.RecentTaskInfo#activityIcon}. * * @see ActivityManager#getRecentTasks * @see ActivityManager.RecentTaskInfo |