tree a8c67170c95dec2111a614542e5ff601c015b1de
parent 57d01932e6b488da10ac1f007fefa426f29c32aa
parent 27a8051544ff6090d153ad6ae9abf2296421b4e7
author Jeff Arneson <jarneson@google.com> 1414363946 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414363946 +0000

am 27a80515: am 8566f2d5: am 9ee73fde: Inner classes export showAnnotations from their containing class

* commit '27a8051544ff6090d153ad6ae9abf2296421b4e7':