Merge "Do not use ISipService binder if it is null am: f08fe96 am: 950cbb5" into nyc-mr1-dev-plus-aosp
am: 34be3b4

* commit '34be3b42acb2da97bd575e494c4302c2355887ea':

Change-Id: I222099a5705ff5f72b4d9a89c27c17ec4a702abd
tree: 6422beaffd377e4524db685d2aedcda6df8e309f
  1. src/
  2. Android.mk
  3. CleanSpec.mk