tree e2105cc3e5af5416d2871f8a3d6ea840f19d01be
parent 240d3771eb2b29c64ae61c1c700d526c97e5f57d
parent 6d5b7febd705a33ab41459743d12623afcbf96bd
author Zhihai Xu <zhihaixu@google.com> 1364613493 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364613493 -0700

am 6d5b7feb: fix compilation error for broadcom branch

* commit '6d5b7febd705a33ab41459743d12623afcbf96bd':
  fix compilation error for broadcom branch