diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-21 09:25:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-21 09:25:50 -0800 |
| commit | 29d60b95fa8019c0542f46551057c4d376bb8a7a (patch) | |
| tree | f6d1dddf38297719b85b95bdb332818d098965b7 /docs/html/guide/topics | |
| parent | 911b2ce3da7dbd8b6335d1092fc6c9e880147104 (diff) | |
| parent | 8d41e653bae240488281d430309e2d501e9524e5 (diff) | |
| download | frameworks_base-29d60b95fa8019c0542f46551057c4d376bb8a7a.zip frameworks_base-29d60b95fa8019c0542f46551057c4d376bb8a7a.tar.gz frameworks_base-29d60b95fa8019c0542f46551057c4d376bb8a7a.tar.bz2 | |
am 8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '8d41e653bae240488281d430309e2d501e9524e5':
Miscellaneous small documentation fixes.
Diffstat (limited to 'docs/html/guide/topics')
| -rw-r--r-- | docs/html/guide/topics/manifest/activity-element.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index 8df1fdf..eabfa60 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -580,7 +580,7 @@ This attribute was introduced in API Level 3. <a href="#nm"><code>android:name</code></a> attribute. <p>The system reads this attribute to determine which activity should be started when - the use presses the Up button in the action bar. The system can also use this information to + the user presses the Up button in the action bar. The system can also use this information to synthesize a back stack of activities with {@link android.app.TaskStackBuilder}.</p> <p>To support API levels 4 - 16, you can also declare the parent activity with a {@code |