OSDN Git Service

am ccf1cc55: Merge "Fix the mac build."
authorDan Albert <danalbert@google.com>
Wed, 4 Mar 2015 06:23:10 +0000 (06:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Mar 2015 06:23:10 +0000 (06:23 +0000)
commita10263ed1f1532127a135943dce993443c5dca51
treefedfd717ca66554d551ba58049ee1e0e6627a8a5
parent850e0b3affe8a1b047eeb136bf104ed8759f8dad
parentccf1cc55a4448dc43302624da07d3211356473e2
am ccf1cc55: Merge "Fix the mac build."

* commit 'ccf1cc55a4448dc43302624da07d3211356473e2':
  Fix the mac build.