OSDN Git Service

Merge "Fix build."
authorMathieu Chartier <mathieuc@google.com>
Thu, 22 May 2014 00:53:32 +0000 (00:53 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 22 May 2014 00:53:34 +0000 (00:53 +0000)
commit5d8b7b22a53aecb01e4140216e2d949859c9991e
tree9395663273bfe921a001c0657d03ce7378025fe7
parent061ece161d51bf81b8dea9e49b5f6dbb74a2936d
parente9e55ac9f68b74a0fcd208685082fd6a1e89a51e
Merge "Fix build."