tree 4af27179107fa90b0593728ef2ca64e5388214bf
parent 3e45da65c7b31f6b66368028940b01ed4b3955b7
parent 3f88ebb2e964b4367a0abe85c06c84055ec11687
author Jeff Arneson <jarneson@google.com> 1425516933 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425516933 +0000

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 '3f88ebb2e964b4367a0abe85c06c84055ec11687':
  Add error for when method return/parameter type has type parameter that is hidden