tree 32c63ccadbd0695800b2aab2c8246810d62b39ab
parent 9729b41574ca5e5e87c86b203a2096cbdc72cfea
parent 4481c325b16d4a42fd0ebf4c8a2bb5bcc09daf5e
author Jeff Sharkey <jsharkey@android.com> 1379723967 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379723967 -0700

am 4481c325: Fix Mac builds.

* commit '4481c325b16d4a42fd0ebf4c8a2bb5bcc09daf5e':
  Fix Mac builds.