Merge "Do not use ISipService binder if it is null am: f08fe96 am: 950cbb5" into nyc-mr1-dev-plus-aosp
tree: 6422beaffd377e4524db685d2aedcda6df8e309f
  1. src/
  2. Android.mk
  3. CleanSpec.mk