summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-04-03 17:33:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-03 17:33:59 -0700
commitea19228daabf42b4aa30d0b43638ddd5a4e3d6d5 (patch)
treef507eaf1ebd77508341c564f38fa4eb2ac7a7554 /docs
parent43644aa1ead4e5219cff8a81f0818265b2b1eb28 (diff)
parent69b7a1cb9a75374867f9d13117312335f11fe593 (diff)
downloadframeworks_base-ea19228daabf42b4aa30d0b43638ddd5a4e3d6d5.zip
frameworks_base-ea19228daabf42b4aa30d0b43638ddd5a4e3d6d5.tar.gz
frameworks_base-ea19228daabf42b4aa30d0b43638ddd5a4e3d6d5.tar.bz2
am 69b7a1cb: am 2456a3fa: am 7c4b45ec: am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
* commit '69b7a1cb9a75374867f9d13117312335f11fe593': Doc update: getString -> getInt
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/manifest/meta-data-element.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/topics/manifest/meta-data-element.jd b/docs/html/guide/topics/manifest/meta-data-element.jd
index 85a871d..56a214c 100644
--- a/docs/html/guide/topics/manifest/meta-data-element.jd
+++ b/docs/html/guide/topics/manifest/meta-data-element.jd
@@ -80,7 +80,7 @@ to the item. The ID can be retrieved from the meta-data Bundle by the
</tr><tr>
<td>Color value, in the form "{@code #rgb}", "{@code #argb}",
"{@code #rrggbb}", or "{@code #aarrggbb}"</td>
- <td>{@link android.os.Bundle#getString(String) getString()}</td>
+ <td>{@link android.os.Bundle#getInt(String) getInt()}</td>
</tr><tr>
<td>Float value, such as "{@code 1.23}"</td>
<td>{@link android.os.Bundle#getFloat(String) getFloat()}</td>