tree 43b3b07357d9d257b335801e95338d1b481c57ba
parent 2d3205d2a1404e811cb2c29b57b26137668755ab
parent 45e8fc6bfd9221274f48861287ff7af06ee7a199
author Conley Owens <cco3@android.com> 1311639913 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311639913 -0700

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