summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorQuddus Chong <quddusc@google.com>2012-04-11 16:12:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-11 16:12:23 -0700
commitc4180594855bf108fe6eccf9f7ab57605ba86b58 (patch)
treea7b7a36696265835401ad77ce866e7deb1117d12 /core/java/android
parent4e53730b12f47c4dec98c86a2d293a48ac9787c5 (diff)
parent51cb7ca563dda1ea92b76f216e5d2960dcd62cf8 (diff)
downloadframeworks_base-c4180594855bf108fe6eccf9f7ab57605ba86b58.zip
frameworks_base-c4180594855bf108fe6eccf9f7ab57605ba86b58.tar.gz
frameworks_base-c4180594855bf108fe6eccf9f7ab57605ba86b58.tar.bz2
am 51cb7ca5: am c08787fc: Merge "SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971" into ics-mr1
* commit '51cb7ca563dda1ea92b76f216e5d2960dcd62cf8': SDK doc change: Fixed typo and added method parentheses in line 206. Bug: 6318971
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/Fragment.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index 492fcc7..21ec40c 100644
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -203,7 +203,7 @@ final class FragmentState implements Parcelable {
* <li> {@link #onCreateView} creates and returns the view hierarchy associated
* with the fragment.
* <li> {@link #onActivityCreated} tells the fragment that its activity has
- * completed its own {@link Activity#onCreate Activity.onCreaate}.
+ * completed its own {@link Activity#onCreate Activity.onCreate()}.
* <li> {@link #onStart} makes the fragment visible to the user (based on its
* containing activity being started).
* <li> {@link #onResume} makes the fragment interacting with the user (based on its