diff options
author | Scott Main <smain@google.com> | 2009-12-16 11:18:00 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-16 11:18:00 -0800 |
commit | 18a27886952ba7fb78174508c5348959b31a73ef (patch) | |
tree | 5a2b9b474ede0dcbd4ea2a81f3e2a05f94cac664 /docs/html/guide | |
parent | 73536dda20594e4b5e83396d705127a823bfa362 (diff) | |
parent | 8bda0fb0ca24875ad6084f35250f166b45f967a1 (diff) | |
download | frameworks_base-18a27886952ba7fb78174508c5348959b31a73ef.zip frameworks_base-18a27886952ba7fb78174508c5348959b31a73ef.tar.gz frameworks_base-18a27886952ba7fb78174508c5348959b31a73ef.tar.bz2 |
am 8bda0fb0: Merge change Iccb92649 into eclair
Merge commit '8bda0fb0ca24875ad6084f35250f166b45f967a1' into eclair-plus-aosp
* commit '8bda0fb0ca24875ad6084f35250f166b45f967a1':
docs: fix typo
Diffstat (limited to 'docs/html/guide')
-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 5362dd8..ac0030c 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -24,7 +24,7 @@ page.title=<activity> android:<a href="#proc">process</a>="<i>string</i>" android:<a href="#screen">screenOrientation</a>=["unspecified" | "user" | "behind" | "landscape" | "portrait" | - "sensor" | "nonsensor"] + "sensor" | "nosensor"] android:<a href="#state">stateNotNeeded</a>=["true" | "false"] android:<a href="#aff">taskAffinity</a>="<i>string</i>" android:<a href="#theme">theme</a>="<i>resource or theme</i>" |