commit d194c6ac80007532596a614c86e3c68e129957e7
author Jeff Arneson <jarneson@google.com> Thu Dec 18 16:50:12 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 18 16:50:13 2014 +0000
tree 74698014cec4c198944dafa48c1df2c2fa611001
parent 94e0b530868c56547ee05e84534fa68a1f6346f7
parent c6e8a05f49dea9b5c915ff1d6982abb99c9cfa89

Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs

tools/droiddoc/templates-sdk/macros_override.cs

diff --git a/tools/droiddoc/templates-sdk/macros_override.cs b/tools/droiddoc/templates-sdk/macros_override.cs
index 1525be5..0a94598 100644
--- a/tools/droiddoc/templates-sdk/macros_override.cs
+++ b/tools/droiddoc/templates-sdk/macros_override.cs
@@ -6,7 +6,7 @@
     <?cs each:anno = obj.showAnnotations ?>
       <?cs if:first(anno) ?>
         <span class='annotation-message'>
-          Included in documention by the annotations:
+          Included in documentation by the annotations:
       <?cs /if ?>
       @<?cs var:anno.type.label ?>
       <?cs if:last(anno) == 0 ?>