commit 5d5d49fd06ba27f233bf3b91e5e5ae2b4cdf1782
author Tom Cherry <tomcherry@google.com> Fri Sep 04 18:13:00 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 04 18:13:00 2015 +0000
tree f0ccaef403fadf36abda489efbe85b206c3057b6
parent 6571c17e62a1b8b76d00227f2637d6a8e3569c6c
parent b38afd00ad2d6e96f18b3652009562e732e6c288

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

* commit '4bc10de99f3f84b89b40c46203cbc051224f931d':
  move uncrypt from init.rc to uncrypt.rc

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 92926d4..52d6700 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -557,13 +557,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