am 212282c3: am 80dbd2a7: Merge "Fix build error in init when building with bootchart"

* commit '212282c314265b1d1def070634049c55291576bb':
  Fix build error in init when building with bootchart
This commit is contained in:
Conley Owens 2011-07-21 17:51:48 -07:00 committed by Android Git Automerger
commit 8621b5ea47

View file

@ -646,6 +646,8 @@ static int bootchart_init_action(int nargs, char **args)
} else {
NOTICE("bootcharting ignored\n");
}
return 0;
}
#endif