OSDN Git Service

Merge "Fix the mac build."
authorDan Albert <danalbert@google.com>
Wed, 4 Mar 2015 06:17:19 +0000 (06:17 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 4 Mar 2015 06:17:20 +0000 (06:17 +0000)
commitccf1cc55a4448dc43302624da07d3211356473e2
tree15ad8bd7aa102ac13cb9ad0050c21b30a93b4dcb
parentedab98a40a0954789c21eaf6c122c99be2ce2d99
parentd666bb100965c1465eec5e03af30a30d33fafebe
Merge "Fix the mac build."