tree b12136dcd38756872492fa2667b53cb910afe3f9
parent 89bf2b6ac6b31b5d8e0583ef70a40e9df368f179
parent f23386584b2bd57b95cb11af50669c306ef7a127
author Jeff Arneson <jarneson@google.com> 1425520397 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425520397 +0000

am f2338658: am acc01a24: am 3f88ebb2: am a3af5ae6: am 47ed86e3: Merge "Add error for when method return/parameter type has type parameter that is hidden" into lmp-docs

* commit 'f23386584b2bd57b95cb11af50669c306ef7a127':
  Add error for when method return/parameter type has type parameter that is hidden