summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-04-03 15:28:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-03 15:28:04 -0700
commit43644aa1ead4e5219cff8a81f0818265b2b1eb28 (patch)
tree8d94fd57c1f24f4578a35d629f05ac2266fb6ec3
parent9da4bde42329fe6c03d2eb4617f91892002e4460 (diff)
parent23af4fffba3c9638d3fb7ffbaa50b09b510fd568 (diff)
downloadframeworks_base-43644aa1ead4e5219cff8a81f0818265b2b1eb28.zip
frameworks_base-43644aa1ead4e5219cff8a81f0818265b2b1eb28.tar.gz
frameworks_base-43644aa1ead4e5219cff8a81f0818265b2b1eb28.tar.bz2
am 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs
* commit '23af4fffba3c9638d3fb7ffbaa50b09b510fd568': Doc update: it's -> its
-rw-r--r--docs/html/guide/topics/resources/layout-resource.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/topics/resources/layout-resource.jd b/docs/html/guide/topics/resources/layout-resource.jd
index 380ab15..366ddc8 100644
--- a/docs/html/guide/topics/resources/layout-resource.jd
+++ b/docs/html/guide/topics/resources/layout-resource.jd
@@ -135,7 +135,7 @@ a reference of all available attributes,
</dd>
<dt id="requestfocus-element"><code>&lt;requestFocus&gt;</code></dt>
<dd>Any element representing a {@link android.view.View} object can include this empty element,
- which gives it's parent initial focus on the screen. You can have only one of these
+ which gives its parent initial focus on the screen. You can have only one of these
elements per file.</dd>
<dt id="include-element"><code>&lt;include&gt;</code></dt>