diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-07-07 18:20:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-07 18:20:27 +0000 |
| commit | f72a4b74e6e603bafc485f0bd1c05175009dc596 (patch) | |
| tree | d9099c2d381064f329af5af00c74bdb512a24d32 /init/builtins.cpp | |
| parent | c16821cf255f2c012e7f36716d884136cbf83212 (diff) | |
| parent | f192c5cc526e9ee646266d5cbb29efb612f62e64 (diff) | |
am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
* commit '8104616696ac5e806b16a393ea02c4f5d8efc328':
Revert "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 b58fe21277..ca31c50e1e 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_system_props(int nargs, char **args) { +int do_load_all_props(int nargs, char **args) { if (nargs == 1) { - load_system_props(); + load_all_props(); return 0; } return -1; |