Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21627274 authored by quddusc's avatar quddusc Committed by Android Git Automerger
Browse files

am cc29a170: Merge "docs: Added missing links pointing to parent containers... 

am cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515" into klp-docs

* commit 'cc29a170':
  docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug: 11797515
parents 7c865524 cc29a170

docs/html/guide/topics/manifest/application-element.jd

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ page.title=&lt;application&gt; 
<dt>can contain:</dt>

<dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>

<br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></code>

<br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a></code>

<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>

<br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code>

<br/><code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code>

docs/html/guide/topics/manifest/meta-data-element.jd

+3 −1
Original line number Diff line number Diff line
@@ -12,8 +12,10 @@ parent.link=manifest-intro.html 
<dt>contained in:</dt>

<dd><code><a href="{@docRoot}guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></code>

<br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></code>

<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>

<br/><code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code>

<br/><code><a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></code>

<br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></code></dd>

<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html">&lt;service&gt;</a></code>



<dt>description:</dt>

<dd>A name-value pair for an item of additional, arbitrary data that can