commit cd1a65b69ad2da81e654adab8edeead457a1b1f5
author Tom Cherry <tomcherry@google.com> Fri Sep 04 17:56:27 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 04 17:56:27 2015 +0000
tree af3e11e69080d78687f3c3942c1b96f89d1314cc
parent b00a8a066f5b6ae5b8d0c03ee7f680389b38a260
parent 30c13c4954a959c2e6c5ba126f26d88b2e56be61

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

* commit '30c13c4954a959c2e6c5ba126f26d88b2e56be61':
  move uncrypt from init.rc to uncrypt.rc

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index cd620d7..066e2f2 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -532,13 +532,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