tree 285410fe6524ef9dce6428cbcbc68010531ff8bf
parent 9ca7d1a973f463f6c53f0b9975c500370ab50ef4
author Brian Carlstrom <bdc@google.com> 1409289433 -0700
committer Brian Carlstrom <bdc@google.com> 1409289843 -0700

Fix Mac build

Bug: 17000769,16875245
Change-Id: Id5ff133e0c6c56db6972a187773c7e873b7062ee