tree 6c5bf9a44339fbf7064fa9ba913dcbd1736613b6
parent 46b0fc9b2de86241489d9d97c8f40d2e89527d29
parent b1d918baddc2331873ea29df31bff799da76df87
author Conley Owens <cco3@android.com> 1312316472 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312316472 -0700

am f87743e7: Merge "Prevent NullPointerException cases while using SipService."

* commit 'f87743e7bdfd10b9a1719036a6320a32df078879':
  Prevent NullPointerException cases while using SipService.