diff options
| author | Scott Main <smain@google.com> | 2012-11-19 11:54:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-19 11:54:29 -0800 |
| commit | 14120b9ce30d8d3f807a7439c7348bed116b66ff (patch) | |
| tree | 1699cc79799e3979d7763e345d409cde45abe482 /docs | |
| parent | 9371747e752236727be58149a8d04248860c134f (diff) | |
| parent | 68395a61489c560e68a9f8321df96ccdf776d1b6 (diff) | |
| download | frameworks_base-14120b9ce30d8d3f807a7439c7348bed116b66ff.zip frameworks_base-14120b9ce30d8d3f807a7439c7348bed116b66ff.tar.gz frameworks_base-14120b9ce30d8d3f807a7439c7348bed116b66ff.tar.bz2 | |
am 68395a61: am 0d3eb5f1: am 721b370c: Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo" into jb-mr1-dev
* commit '68395a61489c560e68a9f8321df96ccdf776d1b6':
cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/guide/topics/resources/more-resources.jd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/guide/topics/resources/more-resources.jd b/docs/html/guide/topics/resources/more-resources.jd index d37b9f8..9fa1a2d 100644 --- a/docs/html/guide/topics/resources/more-resources.jd +++ b/docs/html/guide/topics/resources/more-resources.jd @@ -540,7 +540,7 @@ resource ID.</dd> <dt>resource reference:</dt> <dd> -In Java: <code>R.array.<em>string_array_name</em></code><br/> +In Java: <code>R.array.<em>integer_array_name</em></code><br/> In XML: <code>@[<em>package</em>:]array.<em>integer_array_name</em></code> </dd> @@ -565,7 +565,7 @@ In XML: <code>@[<em>package</em>:]array.<em>integer_array_name</em></code> <dd><strong>Required.</strong> This must be the root node. <p>No attributes.</p> </dd> - <dt id="integer-array-element"><code><string-array></code></dt> + <dt id="integer-array-element"><code><integer-array></code></dt> <dd>Defines an array of integers. Contains one or more child {@code <item>} elements. <p class="caps">attributes:</p> <dl class="atn-list"> |