tree 5a2b7eee2c55bbb4ca138aaaa32f53a40e18cbe0
parent 5470283790893fec5af417518ff23ddff86596ca
parent 33cca17c91bb64147725d1d84eed92845fe572b7
author Yorke Lee <yorkelee@google.com> 1435797359 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435797359 +0000

am 33cca17c: Merge "Fix dialer monkey NPEs" into mnc-dev

* commit '33cca17c91bb64147725d1d84eed92845fe572b7':
  Fix dialer monkey NPEs