diff options
| author | Conley Owens <cco3@android.com> | 2011-07-21 17:41:32 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-07-21 17:41:32 -0700 |
| commit | 80dbd2a7f277e2fcf831e2ac1b2da574e1513564 (patch) | |
| tree | a567c7734fd32c7ba0622dae435003583f644493 /init | |
| parent | 3ddaa0ad1eea0bd9b8137ccf3f200992f7d98c5a (diff) | |
| parent | 9ab8190e418c9985ae1b92ad8fa2d20b2ed216e9 (diff) | |
| download | system_core-80dbd2a7f277e2fcf831e2ac1b2da574e1513564.tar.gz system_core-80dbd2a7f277e2fcf831e2ac1b2da574e1513564.tar.bz2 system_core-80dbd2a7f277e2fcf831e2ac1b2da574e1513564.zip | |
Merge "Fix build error in init when building with bootchart"
Diffstat (limited to 'init')
| -rwxr-xr-x | init/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/init/init.c b/init/init.c index 75ffb5c7..f2a1d274 100755 --- a/init/init.c +++ b/init/init.c @@ -646,6 +646,8 @@ static int bootchart_init_action(int nargs, char **args) } else { NOTICE("bootcharting ignored\n"); } + + return 0; } #endif |