commit 4bc10de99f3f84b89b40c46203cbc051224f931d
author Tom Cherry <tomcherry@google.com> Fri Sep 04 18:02:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 04 18:02:34 2015 +0000
tree 8d49506f9661c4e4e2cbe18648d4c39aea288964
parent c74403b4c9c8acae326b39f06905a3a291a5471f
parent cd1a65b69ad2da81e654adab8edeead457a1b1f5

am cd1a65b6: am 30c13c49: Merge "move uncrypt from init.rc to uncrypt.rc"

* commit 'cd1a65b69ad2da81e654adab8edeead457a1b1f5':
  move uncrypt from init.rc to uncrypt.rc

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 4b8d8bd..432d420 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -555,13 +555,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