| commit | ac2fddb6619f9d55ba0bbfec1addcd874b744104 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Tue Apr 22 15:30:47 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 22 15:30:47 2014 +0000 |
| tree | 650f828b330be5c9b041fbfdcedfdee2f522e739 | |
| parent | 04c5192ff526c7e6518bad5421ae3a55dead120f [diff] | |
| parent | 0aee64f614d5eae0e50f5e24a1c790dd172b663f [diff] |
Merge "Make Volantis devices encryptable"
diff --git a/rootdir/init.rc b/rootdir/init.rc index 82fa756..b0cd45a 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc
@@ -400,7 +400,6 @@ class_start late_start on property:vold.decrypt=trigger_default_encryption - start surfaceflinger start defaultcrypto on property:vold.decrypt=trigger_encryption