OSDN Git Service

Merge "Fix Mac build."
authorVladimir Marko <vmarko@google.com>
Mon, 26 Jan 2015 15:46:40 +0000 (15:46 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 26 Jan 2015 15:46:41 +0000 (15:46 +0000)
commit60430803a7964b68269e42f04acadb070b25c58c
tree46056ff39cdf661ea943400cfeff1ccd7dcaadb3
parentf90eec005997f98c1a9f874fbbf68414e5f9c766
parentbc503348a1da573488503cc2819c9e30807bea31
Merge "Fix Mac build."