diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-21 17:19:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-21 17:19:21 +0000 |
| commit | 8d41e653bae240488281d430309e2d501e9524e5 (patch) | |
| tree | 63d2675bd5c483a98848261cd6c6beca3ff5c458 /docs/html/guide/topics/manifest | |
| parent | 4a642ee5e65ca47ecf6cb274096162e580aac922 (diff) | |
| parent | 9525f2a72e2786f1b53927878dd8234859ea5c39 (diff) | |
| download | frameworks_base-8d41e653bae240488281d430309e2d501e9524e5.zip frameworks_base-8d41e653bae240488281d430309e2d501e9524e5.tar.gz frameworks_base-8d41e653bae240488281d430309e2d501e9524e5.tar.bz2 | |
Merge "Miscellaneous small documentation fixes."
Diffstat (limited to 'docs/html/guide/topics/manifest')
| -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 |