diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2014-02-12 19:31:15 -0800 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2014-02-12 19:31:15 -0800 |
| commit | a97e17785714e5155184199161b3d288f13d0134 (patch) | |
| tree | 721d2cc88db8212cc8b58a407d1d52bd89e53e8b /docs/html/guide/topics/manifest/meta-data-element.jd | |
| parent | c462073b24ab7c71e4ba5046c1a28ac27a001d60 (diff) | |
| parent | 47d3eaf6b1d1aec8517bef6da9e8c3561f21d7bd (diff) | |
| download | frameworks_base-a97e17785714e5155184199161b3d288f13d0134.zip frameworks_base-a97e17785714e5155184199161b3d288f13d0134.tar.gz frameworks_base-a97e17785714e5155184199161b3d288f13d0134.tar.bz2 | |
Merge commit '47d3eaf6' into manualmerge
Conflicts:
docs/html/design/patterns/accessibility.jd
docs/html/design/patterns/actionbar.jd
docs/html/design/patterns/compatibility.jd
docs/html/design/patterns/multi-pane-layouts.jd
docs/html/design/style/iconography.jd
Change-Id: I349cf8ebc159c0a7ef0796900e2d11fe6e0c888a
Diffstat (limited to 'docs/html/guide/topics/manifest/meta-data-element.jd')
| -rw-r--r-- | docs/html/guide/topics/manifest/meta-data-element.jd | 2 |
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 ee80c84..241153b 100644 --- a/docs/html/guide/topics/manifest/meta-data-element.jd +++ b/docs/html/guide/topics/manifest/meta-data-element.jd @@ -18,7 +18,7 @@ parent.link=manifest-intro.html <br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> <dt>description:</dt> -<dd>A name-value pair for an item of additional, arbitrary data that can +<dd itemprop="description">A name-value pair for an item of additional, arbitrary data that can be supplied to the parent component. A component element can contain any number of {@code <meta-data>} subelements. The values from all of them are collected in a single {@link android.os.Bundle} object and made |