| commit | 45e8fc6bfd9221274f48861287ff7af06ee7a199 | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Mon Jul 25 12:21:21 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 25 12:21:21 2011 -0700 |
| tree | 411b0deb042ddcde42bc228cdb3a25b6ca87b534 | |
| parent | 01acea112501f7d140f100591319781e59b90d0e [diff] | |
| parent | 8621b5ea475822499128e6f138a9dfc224bbb569 [diff] |
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
diff --git a/init/init.c b/init/init.c index e13d4b1..bb27c4e 100755 --- a/init/init.c +++ b/init/init.c
@@ -673,6 +673,8 @@ } else { NOTICE("bootcharting ignored\n"); } + + return 0; } #endif