tree 18468929a59110ae9c0370d577d8d1a4748bb855
parent 5624eba1aeb5c28b4d13f324f0eb6eccd6afd1cd
parent a3af5ae68b8d586eda29711ade3b45cecfce6669
author Jeff Arneson <jarneson@google.com> 1425516557 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425516557 +0000

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

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