OSDN Git Service

Merge "Fix more of the Mac build."
authorDave Allison <dallison@google.com>
Mon, 11 Aug 2014 19:18:39 +0000 (19:18 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 11 Aug 2014 18:49:32 +0000 (18:49 +0000)
commitfba83719dddaa5043c6c6f21e1000ca2faeaea39
treea52a5f13064b92a0a78a04a380e32fc21a977216
parent6e1fa769a6baf407116ab18dea8b760d130f7c3a
parent85fa796277d23e6bf1679cbd0da0019b03d8066b
Merge "Fix more of the Mac build."