summaryrefslogtreecommitdiffstats
path: root/docs/html/training/basics/fragments
diff options
context:
space:
mode:
authorScott Kennedy <skennedy@google.com>2013-04-03 09:20:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-03 09:20:38 -0700
commit555c82cd43ef8d11bcf54f023864619869c06411 (patch)
tree5969aca0ef873a69e6e21d126e00d30b76915eb9 /docs/html/training/basics/fragments
parent78e5d1834ea1271b17410962f6640deb04a59300 (diff)
parentf7c06ddbfc79921d389ed6699df17e54c428571e (diff)
downloadframeworks_base-555c82cd43ef8d11bcf54f023864619869c06411.zip
frameworks_base-555c82cd43ef8d11bcf54f023864619869c06411.tar.gz
frameworks_base-555c82cd43ef8d11bcf54f023864619869c06411.tar.bz2
am f7c06ddb: Merge "docs: Typos and other fixes" into jb-mr1-dev
* commit 'f7c06ddbfc79921d389ed6699df17e54c428571e': docs: Typos and other fixes
Diffstat (limited to 'docs/html/training/basics/fragments')
-rw-r--r--docs/html/training/basics/fragments/fragment-ui.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/training/basics/fragments/fragment-ui.jd b/docs/html/training/basics/fragments/fragment-ui.jd
index d648938..db3119b 100644
--- a/docs/html/training/basics/fragments/fragment-ui.jd
+++ b/docs/html/training/basics/fragments/fragment-ui.jd
@@ -41,7 +41,7 @@ tablet which has a wider screen size to display more information to the user.</p
<img src="{@docRoot}images/training/basics/fragments-screen-mock.png" alt="" />
<p class="img-caption"><strong>Figure 1.</strong> Two fragments, displayed in different
-configurations for the same activity on different screen sizes. On a large screen, both fragment
+configurations for the same activity on different screen sizes. On a large screen, both fragments
fit side by side, but on a handset device, only one fragment fits at a time so the fragments must
replace each other as the user navigates.</p>