commit 8566f2d5a4aebe02c2324b40b29d351113cd976a
author Jeff Arneson <jarneson@google.com> Wed Oct 15 17:52:47 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 15 17:52:47 2014 +0000
tree 51f96098fd94fb067bc23393b8d495e9208eb373
parent 0e1d184f4aa6421d7b0cc92bbf558abc2f875698
parent 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51

am 9ee73fde: Inner classes export showAnnotations from their containing class

* commit '9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51':
  Inner classes export showAnnotations from their containing class

src/com/google/doclava/ClassInfo.java

diff --git a/src/com/google/doclava/ClassInfo.java b/src/com/google/doclava/ClassInfo.java
index add8270..466c22b 100644
--- a/src/com/google/doclava/ClassInfo.java
+++ b/src/com/google/doclava/ClassInfo.java
@@ -1429,7 +1429,7 @@
   }
 
   public boolean hasShowAnnotation() {
-    return mShowAnnotations.size() > 0;
+    return mShowAnnotations != null && mShowAnnotations.size() > 0;
   }
 
   public ArrayList<AnnotationInstanceInfo> showAnnotations() {