| commit | c21dcef9fecaa224f153af0c5643fca4933bbc7f | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Mon Jul 25 17:25:13 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 25 17:25:13 2011 -0700 |
| tree | 43b3b07357d9d257b335801e95338d1b481c57ba | |
| parent | 2d3205d2a1404e811cb2c29b57b26137668755ab [diff] | |
| parent | 45e8fc6bfd9221274f48861287ff7af06ee7a199 [diff] |
am 45e8fc6b: am 8621b5ea: am 212282c3: am 80dbd2a7: Merge "Fix build error in init when building with bootchart" * commit '45e8fc6bfd9221274f48861287ff7af06ee7a199': Fix build error in init when building with bootchart
diff --git a/init/init.c b/init/init.c index 1e31cf9..a1d6be1 100755 --- a/init/init.c +++ b/init/init.c
@@ -677,6 +677,8 @@ } else { NOTICE("bootcharting ignored\n"); } + + return 0; } #endif