| commit | 7d8262cb554c41892794f23b92e01b52458288bb | [log] [tgz] |
|---|---|---|
| author | Dave Platt <dplatt@google.com> | Tue Mar 04 13:59:57 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 04 13:59:57 2014 -0800 |
| tree | 187b3872ca355058eeb5c3e8fa6c3b70cf9e5aab | |
| parent | 7a93aa2fc2555b0de41bb5f30eb0e9cce2413084 [diff] | |
| parent | 22f66b76f5e49704f3be76ad3fff7e4b5456864d [diff] |
am 22f66b76: Merge "Harden NsdManager against null-dereference crashes" * commit '22f66b76f5e49704f3be76ad3fff7e4b5456864d': Harden NsdManager against null-dereference crashes