tree 7687d4b570cf991cb8536adb4dbc1501f5cd4394
parent e6510f1c59863fe8d9d3f6d335adea18d7ed47da
parent 6b265bd4a12e7518a275dddf41c33279bea8e16b
author Ian Rogers <irogers@google.com> 1401357745 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401357745 +0000

am 6b265bd4: Merge "Revert "Revert "Fix the mac build."""

* commit '6b265bd4a12e7518a275dddf41c33279bea8e16b':
  Revert "Revert "Fix the mac build.""