Merge commit '19155b5'

Do not start sshd by default

Change-Id: I22e6dbb6834321709e9b7c5ae49846d7f9f7c67a
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 45aef41..1c1bc0f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -506,3 +506,4 @@
 
 service sshd /system/bin/start-ssh
     class main
+    disabled