tree 74938fa7ab768e2d47302fa1e5906e82206fdc8c
parent d24bf4ab07693e910410cffb745e83bc572fd339
parent 6eddb39c857b178672218a345a276c4304e7ad37
author Robert Greenwalt <rgreenwalt@google.com> 1384367266 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384367266 -0800

am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService"

* commit '6eddb39c857b178672218a345a276c4304e7ad37':
  Fix NPE in ConnectivityService