tree f185c28a1b21b23afd9dd531787bc963fe1adfdf
parent f5579498d93e1ba56aaf23765f3693dfddab8599
parent d75d6c91d24c071534ed36db85a1e72b33dc5a10
author Dan Albert <danalbert@google.com> 1424889266 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424889266 +0000

am d75d6c91: Merge "Fix the mac build."

* commit 'd75d6c91d24c071534ed36db85a1e72b33dc5a10':
  Fix the mac build.