am 0f1259cc: am 8c82d250: Merge "docs: clarify startActivity" into jb-mr1.1-docs

* commit '0f1259ccb7427af5d9f7cdd51d9be1a6f2ec9b8d':
  docs: clarify startActivity
This commit is contained in:
Scott Main
2013-03-05 13:06:35 -08:00
committed by Android Git Automerger

View File

@@ -1019,7 +1019,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
}
/**
* Call {@link Activity#startActivity(Intent)} on the fragment's
* Call {@link Activity#startActivity(Intent)} from the fragment's
* containing Activity.
*
* @param intent The intent to start.
@@ -1029,7 +1029,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
}
/**
* Call {@link Activity#startActivity(Intent, Bundle)} on the fragment's
* Call {@link Activity#startActivity(Intent, Bundle)} from the fragment's
* containing Activity.
*
* @param intent The intent to start.
@@ -1051,7 +1051,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
}
/**
* Call {@link Activity#startActivityForResult(Intent, int)} on the fragment's
* Call {@link Activity#startActivityForResult(Intent, int)} from the fragment's
* containing Activity.
*/
public void startActivityForResult(Intent intent, int requestCode) {
@@ -1059,7 +1059,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
}
/**
* Call {@link Activity#startActivityForResult(Intent, int, Bundle)} on the fragment's
* Call {@link Activity#startActivityForResult(Intent, int, Bundle)} from the fragment's
* containing Activity.
*/
public void startActivityForResult(Intent intent, int requestCode, Bundle options) {