| commit | b4a78de40f74b58a17ce704d0b36afe593f7537b | [log] [tgz] |
|---|---|---|
| author | Dave Platt <dplatt@google.com> | Tue Mar 04 22:02:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 04 22:02:55 2014 +0000 |
| tree | ba15f5f78af62af583f74218e5823ef21017bb60 | |
| parent | 59e808f5491ded962445be7bff490e1fb32480ab [diff] | |
| parent | 6948cb40739a0f1218ef4a32d77a1c91aa4a6df8 [diff] |
am 7d8262cb: am 6948cb40: Merge "Harden NsdManager against null-dereference crashes" * commit '7d8262cb554c41892794f23b92e01b52458288bb': Harden NsdManager against null-dereference crashes