tree 0d680e4c659ace7cb64669bd84e700e27958c163
parent c844a0f04e07bb0b8761e2648392251d522c89c1
parent 2b07096c1de5461339d9ea97869d33b5166544ae
author Brian Carlstrom <bdc@google.com> 1383079251 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383079251 -0700

am 2b07096c: Fix Mac build

* commit '2b07096c1de5461339d9ea97869d33b5166544ae':
  Fix Mac build