tree dc429e5271af85b3e630950b523a862f41c3ef58
parent c9a7eeba15641da5a5bc8499e813e6c2211506ff
parent 98a027a506b5acff1a7ab0cc3655399da7d025c7
author Dave Platt <dplatt@google.com> 1395190494 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395190494 +0000

am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev

* commit '98a027a506b5acff1a7ab0cc3655399da7d025c7':
  Harden NsdManager against null-dereference crashes