tree 4af27179107fa90b0593728ef2ca64e5388214bf
parent 467748ab0693964c58bb376025eeb5f7d9af7e9a
parent acc01a24ed0e135418e2d8f51e117f14256e2e10
author Jeff Arneson <jarneson@google.com> 1425517851 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425517851 +0000

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