summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-04-03 17:26:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-03 17:26:42 -0700
commit7c4b45ec0ede9b485446367ead5c54fac734c26a (patch)
tree9a4de8036625406e5d9a57fa2208aadd39552ea3
parent82c01b09c8b0db759a3271e5b20e1a565491e3b7 (diff)
parent7f932e88d61b977be48e2f6157f8de64c89400d9 (diff)
downloadframeworks_base-7c4b45ec0ede9b485446367ead5c54fac734c26a.zip
frameworks_base-7c4b45ec0ede9b485446367ead5c54fac734c26a.tar.gz
frameworks_base-7c4b45ec0ede9b485446367ead5c54fac734c26a.tar.bz2
am 7f932e88: Merge "Doc update: getString -> getInt" into jb-mr1.1-docs
* commit '7f932e88d61b977be48e2f6157f8de64c89400d9': Doc update: getString -> getInt
-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>