tree db20fbbe123bccd81d42d61734c6cc2a0cdf9d99
parent 221080078a36f4b30fe6edc8c91f339a5b84ed83
parent 18490abd9bcb401f0d75a314056fb2a44dd61f07
author Robert Greenwalt <rgreenwalt@google.com> 1384367130 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384367130 -0800

am 18490abd: Merge "Fix NPE in ConnectivityService"

* commit '18490abd9bcb401f0d75a314056fb2a44dd61f07':
  Fix NPE in ConnectivityService