tree 6f2f1246e6aa1ca73b83ea68f4061f13b36cc0e0
parent 5607c8e770b07e1a332a53b2f0c07f2caa4f9177
author Dan Albert <danalbert@google.com> 1407690899 -0700
committer Dave Allison <dallison@google.com> 1407781880 -0700

Fix more of the Mac build.

Change-Id: I0fa52ef73e86318bb68de2c69bbed81a00bfc3e0