tree 681586441d91241c129e77ba1afce906b2ab848c
parent 8eb6aaf9e3d46aaaae03f0ea35cea352dbc712b0
parent 52eafbb7601eac6ce0011edeb2a73ffccb6fb751
author Michael Kolb <kolby@google.com> 1336426015 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336426015 -0700

am 52eafbb7: Merge "fix monkey NPE" into jb-dev

* commit '52eafbb7601eac6ce0011edeb2a73ffccb6fb751':
  fix monkey NPE