tree 9f9e00c4fa258310db6d2142d5b9a4bd71d93608
parent 8d5ffb03e4da64f2d650d94fae94c192e758b409
author Elliott Hughes <enh@google.com> 1326955601 -0800
committer Elliott Hughes <enh@google.com> 1326955601 -0800

Yet more Mac build fixes.

Change-Id: Ic1a009f99a7e688931d90a8c3293d9bbb5dcd7f5