tree 51f96098fd94fb067bc23393b8d495e9208eb373
parent 0e1d184f4aa6421d7b0cc92bbf558abc2f875698
parent 9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
author Jeff Arneson <jarneson@google.com> 1413395567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413395567 +0000

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

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