tree 18468929a59110ae9c0370d577d8d1a4748bb855
parent d71cda5440383925192953226deb316fabebf605
parent 47ed86e3f668b7d12bfca0db7ce4c11c3d691fc6
author Jeff Arneson <jarneson@google.com> 1425488708 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425488708 +0000

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

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