Add null pointer check for searchReceiver.
Merge remote-tracking branch 'origin/master' into riversyang
Add classpath to gitignore.
Merge remote-tracking branch 'origin/master' into riversyang
Comment out source code for WifiDirect mode.
Add resume method to DefaultServiceManager.
Add call to DefaultServiceManager.resume
Merge remote-tracking branch 'origin/riversyang'