summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-06-26 21:59:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-26 21:59:44 -0700
commitde6082551da1651e7c8c0d91de908710b6c11113 (patch)
tree5fea3ed15ab0abac2bd59bdbd67541268355ab3f /core/java/android/content
parentca6f644e4effdb87d5b3bc6a3a40f8016dc9d568 (diff)
parent882c97b59a8ef89ff8efa9064829f8014b9a7638 (diff)
downloadframeworks_base-de6082551da1651e7c8c0d91de908710b6c11113.zip
frameworks_base-de6082551da1651e7c8c0d91de908710b6c11113.tar.gz
frameworks_base-de6082551da1651e7c8c0d91de908710b6c11113.tar.bz2
am 882c97b5: am cdb3f9c4: Merge "docs: add api overview for jb" into jb-dev
* commit '882c97b59a8ef89ff8efa9064829f8014b9a7638': 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 2800930..66fed818 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);