tree 1af46fb185c5b8154266fc3c948510d9e8d829ba
parent eac14ef59447dc38d1a70d800dad2f7145211085
parent 3c6b93173938791f21b8c5055f592f24f5763759
author Christopher Ferris <cferris@google.com> 1427173251 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427173251 +0000

am 8e1697e7: Merge "Fix mac sdk build."

* commit '8e1697e7528f88985a5d702af53ef5d446f65fa1':
  Fix mac sdk build.