tree 9d5de85848329c642530920d2f4d4f78b486c564
parent 9933f800255c05ca45d036ec172d4da8383ac061
author Ian Rogers <irogers@google.com> 1401340225 +0000
committer Ed Heyl <edheyl@google.com> 1401342201 +0000

cherry-pick ahead of the automerger: Merge "Revert "Fix the mac build.""