tree 7687d4b570cf991cb8536adb4dbc1501f5cd4394
parent 079e6e4cfbd1a0b1ab2e94e6d52a7304321ae597
author Ian Rogers <irogers@google.com> 1401341254 -0700
committer Ian Rogers <irogers@google.com> 1401343422 -0700

Revert "Revert "Fix the mac build.""

This reverts commit a8a167d6883e4acee42619e0bbfd811984f6e94d.
Also, workaround a clang 3.5 issue bug: 15319952

Change-Id: If2ec321d63d9484c21208339f66eb6a16b65bf74