tree 8400e417928dc4bc56657935d1e1cc5fe2bd3c63
parent 45937dbd2a61957cf31f69a92659050c04cb9cc7
parent 249b94b40b98f97e2388cc0cfbba2de7ed618b98
author Christopher Ferris <cferris@google.com> 1427174450 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427174450 +0000

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

* commit 'bdabcf4c8bd7c9b5b29e2d3af07a5fb0e2733823':
  Fix mac sdk build.