tree 411b0deb042ddcde42bc228cdb3a25b6ca87b534
parent 01acea112501f7d140f100591319781e59b90d0e
parent 8621b5ea475822499128e6f138a9dfc224bbb569
author Conley Owens <cco3@android.com> 1311621681 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311621681 -0700

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