tree 148c2fc035c65c904c29217f4dc83562d64ca78f
parent 7df080b27921827327952628c46dcea6ae6caf34
parent 80dbd2a7f277e2fcf831e2ac1b2da574e1513564
author Conley Owens <cco3@android.com> 1311295801 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311295801 -0700

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

* commit '80dbd2a7f277e2fcf831e2ac1b2da574e1513564':
  Fix build error in init when building with bootchart