tree 1af46fb185c5b8154266fc3c948510d9e8d829ba
parent 30cf40152a8d7baca7e0e875b7e3d2f2e3ecae38
parent e9c50967dcf481a00911e4086be737cd2ed89aa9
author Christopher Ferris <cferris@google.com> 1427173639 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427173639 +0000

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

* commit '730d7c530a4e0d8fc0a2c21f024288b4acacf3b9':
  Fix mac sdk build.