tree 61770005e0c3250f6d10c7bba175dfdef9fada0b
parent 8cddf5fc337a80e6b03ca560673c476a3697ae65
parent 0e8131db9994d36b7cf9b61bfccb5fb374e09a19
author Zhihai Xu <zhihaixu@google.com> 1364611922 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364611922 -0700

am 0e8131db: Revert "fix the compilation error in broadcom partner branch"

* commit '0e8131db9994d36b7cf9b61bfccb5fb374e09a19':
  Revert "fix the compilation error in broadcom partner branch"