| commit | 212282c314265b1d1def070634049c55291576bb | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Thu Jul 21 17:50:01 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 21 17:50:01 2011 -0700 |
| tree | 148c2fc035c65c904c29217f4dc83562d64ca78f | |
| parent | 7df080b27921827327952628c46dcea6ae6caf34 [diff] | |
| parent | 80dbd2a7f277e2fcf831e2ac1b2da574e1513564 [diff] |
am 80dbd2a7: Merge "Fix build error in init when building with bootchart" * commit '80dbd2a7f277e2fcf831e2ac1b2da574e1513564': Fix build error in init when building with bootchart
diff --git a/init/init.c b/init/init.c index 75ffb5c..f2a1d27 100755 --- a/init/init.c +++ b/init/init.c
@@ -646,6 +646,8 @@ } else { NOTICE("bootcharting ignored\n"); } + + return 0; } #endif