tree cebb414a699ae1c4cad7cf08cc2f72b0e55e6f40
parent acc01a24ed0e135418e2d8f51e117f14256e2e10
parent 2c119d8e27ceac1471de4ba751a73e2e3bf1a30c
author Jeff Arneson <jarneson@google.com> 1426095129 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426095129 +0000

am 2c119d8e: am 8714f8c8: am 74512bea: Fix a NPE in the type parameter checking in stubs

* commit '2c119d8e27ceac1471de4ba751a73e2e3bf1a30c':
  Fix a NPE in the type parameter checking in stubs