summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/topics
diff options
context:
space:
mode:
authorDavid Friedman <dmail@google.com>2014-04-28 23:03:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-28 23:03:25 +0000
commit0c18705bf10e1e04fbb2b2afaf5f9537764148a5 (patch)
tree5589311897eac7ebd5f9ddac0274831eb958a1e5 /docs/html/guide/topics
parent3c5a6cf93520be23e6d5a9bc4cb8f4e8c18214b1 (diff)
parent3fef8e60668bb955763367ac17c1195e46b3078c (diff)
downloadframeworks_base-0c18705bf10e1e04fbb2b2afaf5f9537764148a5.zip
frameworks_base-0c18705bf10e1e04fbb2b2afaf5f9537764148a5.tar.gz
frameworks_base-0c18705bf10e1e04fbb2b2afaf5f9537764148a5.tar.bz2
am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs
* commit '3fef8e60668bb955763367ac17c1195e46b3078c': Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
Diffstat (limited to 'docs/html/guide/topics')
-rw-r--r--docs/html/guide/topics/manifest/manifest-element.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/guide/topics/manifest/manifest-element.jd b/docs/html/guide/topics/manifest/manifest-element.jd
index 20dc4ea..7717696 100644
--- a/docs/html/guide/topics/manifest/manifest-element.jd
+++ b/docs/html/guide/topics/manifest/manifest-element.jd
@@ -30,7 +30,7 @@ parent.link=manifest-intro.html
<br/><code><a href="{@docRoot}guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html">&lt;permission-tree&gt;</a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/supports-gl-texture.html">&lt;supports-gl-texture&gt;</a></code
+<br/><code><a href="{@docRoot}guide/topics/manifest/supports-gl-texture-element.html">&lt;supports-gl-texture&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/supports-screens-element.html">&lt;supports-screens&gt;</a></code>
<br/><code><a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration&gt;</a></code> <!-- ##api level 3## -->
<br/><code><a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">&lt;uses-feature&gt;</a></code>
@@ -193,4 +193,4 @@ more information about using this attribute (including how to maintain backward
<dd>
<code><a href="{@docRoot}guide/topics/manifest/application-element.html">&lt;application&gt;</a></code></dd>
-</dl> \ No newline at end of file
+</dl>