tree 1b73b9e606e6e1763e76acb380f389a06572518f
parent 4bcca20978433951fc62861f28df11f6686b5797
parent 1c9d1eed31565cc0b21689b5530ca0ac5d35c68a
author Jeff Hao <jeffhao@google.com> 1441240331 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441240331 +0000

am 1c9d1eed: Merge "Fix native annotations returning TypeNotPresentException."

* commit '1c9d1eed31565cc0b21689b5530ca0ac5d35c68a':
  Fix native annotations returning TypeNotPresentException.