am 48eded0e: am 18490abd: Merge "Fix NPE in ConnectivityService"

* commit '48eded0e8fdf594cb53c4137c7cc62d90af87f97':
  Fix NPE in ConnectivityService
tree: d23072a5ea1c6707aab1108aca4471d93be0ffcc
  1. core/
  2. services/