summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-06-26 21:56:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-26 21:56:17 -0700
commit882c97b59a8ef89ff8efa9064829f8014b9a7638 (patch)
tree7fa66ce8ea8be60f64c5c61e1a670ce00d0bbdb1 /core/java/android/content
parentea53ebc8ddc92fce146513203e5fbef800d2b39d (diff)
parentcdb3f9c45b97a64380f044c6b8c1863c1ba58b6a (diff)
downloadframeworks_base-882c97b59a8ef89ff8efa9064829f8014b9a7638.zip
frameworks_base-882c97b59a8ef89ff8efa9064829f8014b9a7638.tar.gz
frameworks_base-882c97b59a8ef89ff8efa9064829f8014b9a7638.tar.bz2
am cdb3f9c4: Merge "docs: add api overview for jb" into jb-dev
* commit 'cdb3f9c45b97a64380f044c6b8c1863c1ba58b6a': docs: add api overview for jb
Diffstat (limited to 'core/java/android/content')
-rw-r--r--core/java/android/content/Context.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 621113d..ffff9be 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -872,7 +872,7 @@ public abstract class Context {
*
* @throws ActivityNotFoundException
*
- * @see {@link #startActivity(Intent)}
+ * @see #startActivity(Intent)
* @see PackageManager#resolveActivity
*/
public abstract void startActivity(Intent intent, Bundle options);