tree 46d5db28578f74d925565a4393ac76b5f331c282
parent c94ef4716a348a01b5316629ace1ae937745d743
parent 51213d943b3931434cbd196a8a159ee325a4e3fc
author Robert Greenwalt <rgreenwalt@google.com> 1384799871 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384799871 -0800

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

* commit '51213d943b3931434cbd196a8a159ee325a4e3fc':
  Fix NPE in ConnectivityService