diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-07-06 20:34:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-06 20:34:05 +0000 |
| commit | fcc23b7b60ceb3e81533516ffa8f53d9d3b13a6e (patch) | |
| tree | de4056aebbfcf96c5220b516a9ee0dd6c7306570 /init/builtins.cpp | |
| parent | 7541874775766d2211986bf456b03605fb0b2322 (diff) | |
| parent | 9fc7ffcff804a8089d2bebda808335798ec84cd1 (diff) | |
am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev
* commit 'a65e402b613e927697d35e7936c6d80908d77e88':
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 ca31c50e1e..b58fe21277 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; |