tree 7d846b53aaa51be4d2d815c15f3dfd4e0a062b46
parent 5b95025059f0925ad8d11bf503eb2acb4cc63228
parent a8a448da25c62f54cac3318c17c69e851a4ecde9
author Robert Greenwalt <rgreenwalt@google.com> 1384799626 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384799626 -0800

am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev

* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
  Fix NPE in ConnectivityService