tree 39ed0f83fb2dd80ac3fdff410265096ebd08d567
parent 11c51608ee1c368dd38b134603e85943629c6f44
parent 7d8262cb554c41892794f23b92e01b52458288bb
author Dave Platt <dplatt@google.com> 1393970575 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393970575 +0000

am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes"

* commit '7d8262cb554c41892794f23b92e01b52458288bb':
  Harden NsdManager against null-dereference crashes