Merge "move uncrypt from init.rc to uncrypt.rc"
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 7a806f5..5f1169d 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -493,13 +493,3 @@
 service flash_recovery /system/bin/install-recovery.sh
     class main
     oneshot
-
-service uncrypt /system/bin/uncrypt
-    class main
-    disabled
-    oneshot
-
-service pre-recovery /system/bin/uncrypt --reboot
-    class main
-    disabled
-    oneshot