Merge branch 'master' of github.com:shadowsocks/shadowsocks-android

build.sbt

@@ -27,8 +27,8 @@ libraryDependencies ++= Seq(
 
 libraryDependencies ++= Seq(
   "net.simonvt.menudrawer" % "menudrawer" % "3.0.6",
-  "com.google.android.gms" % "play-services" % "5.0.89",
-  "com.android.support" % "support-v4" % "19.1.0"
+  "com.google.android.gms" % "play-services" % "6.1.71",
+  "com.android.support" % "support-v4" % "21.0.3"
 )
 
 libraryDependencies ++= Seq(

src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala

@@ -332,6 +332,7 @@ class ShadowsocksNatService extends Service with BaseService {
       .setSmallIcon(R.drawable.ic_stat_shadowsocks)
       .addAction(android.R.drawable.ic_menu_close_clear_cancel, getString(R.string.stop),
         actionIntent)
+      .setPriority(NotificationCompat.PRIORITY_MIN)
 
     startForegroundCompat(1, builder.build)
   }