diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-08-26 10:07:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-26 10:07:27 +0000 |
| commit | ad5b54aa6480b384f90ecb0acd9e2c6f30fd45c1 (patch) | |
| tree | 8342e12c7da2fbb2daced0c19e0a457ba3fc5724 /rootdir | |
| parent | ec865a6c488cd4250e6599fc62461f8fd2a34776 (diff) | |
| parent | a95e10fe3187d1dd3fbbd01d6653d7d9c2f9fc4d (diff) | |
| download | system_core-ad5b54aa6480b384f90ecb0acd9e2c6f30fd45c1.zip system_core-ad5b54aa6480b384f90ecb0acd9e2c6f30fd45c1.tar.gz system_core-ad5b54aa6480b384f90ecb0acd9e2c6f30fd45c1.tar.bz2 | |
am a95e10fe: am a005e779: Merge "Enable not rebooting during default encryption" into lmp-dev
* commit 'a95e10fe3187d1dd3fbbd01d6653d7d9c2f9fc4d':
Enable not rebooting during default encryption
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/init.rc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 08b9a35..8f17ebc 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -429,7 +429,6 @@ on property:vold.decrypt=trigger_default_encryption on property:vold.decrypt=trigger_encryption start surfaceflinger start encrypt - class_start main on property:sys.init_log_level=* loglevel ${sys.init_log_level} |