diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-07-13 17:53:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 17:53:08 +0000 |
| commit | c1fa34b9f600c827769b4401d8b12e7c587b68f4 (patch) | |
| tree | 1923b4982ffea244df4617f00a49dc14c567f37b /init/builtins.cpp | |
| parent | 8ee286c2164a4a6a8106b21500a336e15c615884 (diff) | |
| parent | d5ef984195779aa9e27d7baabdd751d641eea1a0 (diff) | |
am d5ef9841: Merge "Change init sequence to support file level encryption" into mnc-dr-dev
* commit 'd5ef984195779aa9e27d7baabdd751d641eea1a0':
Change init sequence to support file level encryption
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index ca31c50e1..b58fe2127 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -809,9 +809,9 @@ int do_load_persist_props(int nargs, char **args) { return -1; } -int do_load_all_props(int nargs, char **args) { +int do_load_system_props(int nargs, char **args) { if (nargs == 1) { - load_all_props(); + load_system_props(); return 0; } return -1; |