tree 0645ef91ba07a1c5bf7a7d6dbdfd8c1625397db3
parent d2ab2362b19c59c9aae5ce804ff394d69564b5a6
parent c4c8bcaf857d7b02bb18193730012515945e1627
author Jeff Arneson <jarneson@google.com> 1410200241 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410200241 +0000

am c4c8bcaf: am 5c980afc: Merge "Show annotation information in generated documentation" into lmp-dev

* commit 'c4c8bcaf857d7b02bb18193730012515945e1627':
  Show annotation information in generated documentation