summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-04-03 15:31:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-03 15:31:00 -0700
commitf81e4b4745c8fc8184fa84e3ce8ed66b92b61f49 (patch)
tree2c43a6a358a6c56043b3a9ba4926da4e3c90e3ab
parent599efc3aa34351e02bfa6e8b9e3fd530b8d9c632 (diff)
parent43644aa1ead4e5219cff8a81f0818265b2b1eb28 (diff)
downloadframeworks_base-f81e4b4745c8fc8184fa84e3ce8ed66b92b61f49.zip
frameworks_base-f81e4b4745c8fc8184fa84e3ce8ed66b92b61f49.tar.gz
frameworks_base-f81e4b4745c8fc8184fa84e3ce8ed66b92b61f49.tar.bz2
am 43644aa1: am 23af4fff: am 3f000e58: am 82c01b09: am 28cb2024: Merge "Doc update: it\'s -> its" into jb-mr1.1-docs
* commit '43644aa1ead4e5219cff8a81f0818265b2b1eb28': 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>