tree 2341c702306b03074f8c35140b457fb77e74d946
parent 68955fc82edc2b4a3b61712a9fb9c80a705ba4c0
parent 0ee7d8c68b57c02d02f707d6f71c731234d56eec
author Jeff Sharkey <jsharkey@android.com> 1379725493 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379725493 -0700

am 0ee7d8c6: Fix Mac builds, for realz.

* commit '0ee7d8c68b57c02d02f707d6f71c731234d56eec':
  Fix Mac builds, for realz.