aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Arneson <jarneson@google.com>2014-12-18 16:50:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-18 16:50:13 +0000
commitd194c6ac80007532596a614c86e3c68e129957e7 (patch)
tree74698014cec4c198944dafa48c1df2c2fa611001
parent94e0b530868c56547ee05e84534fa68a1f6346f7 (diff)
parentc6e8a05f49dea9b5c915ff1d6982abb99c9cfa89 (diff)
downloadbuild-d194c6ac80007532596a614c86e3c68e129957e7.tar.gz
Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs
-rw-r--r--tools/droiddoc/templates-sdk/macros_override.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/droiddoc/templates-sdk/macros_override.cs b/tools/droiddoc/templates-sdk/macros_override.cs
index 1525be5058..0a945986e5 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 ?>