diff options
| author | Conley Owens <cco3@android.com> | 2011-07-25 12:21:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-25 12:21:21 -0700 |
| commit | 45e8fc6bfd9221274f48861287ff7af06ee7a199 (patch) | |
| tree | 411b0deb042ddcde42bc228cdb3a25b6ca87b534 /init | |
| parent | 01acea112501f7d140f100591319781e59b90d0e (diff) | |
| parent | 8621b5ea475822499128e6f138a9dfc224bbb569 (diff) | |
| download | system_core-45e8fc6bfd9221274f48861287ff7af06ee7a199.tar.gz system_core-45e8fc6bfd9221274f48861287ff7af06ee7a199.tar.bz2 system_core-45e8fc6bfd9221274f48861287ff7af06ee7a199.zip | |
am 8621b5ea: am 212282c3: am 80dbd2a7: Merge "Fix build error in init when building with bootchart"
* commit '8621b5ea475822499128e6f138a9dfc224bbb569':
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 e13d4b18..bb27c4e3 100755 --- a/init/init.c +++ b/init/init.c @@ -673,6 +673,8 @@ static int bootchart_init_action(int nargs, char **args) } else { NOTICE("bootcharting ignored\n"); } + + return 0; } #endif |