OSDN Git Service

am 01c2b053: Merge "Fix mac build"
authorMathieu Chartier <mathieuc@google.com>
Tue, 14 Jul 2015 17:20:45 +0000 (17:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 17:20:45 +0000 (17:20 +0000)
commit4abb81b894d97e9924aa47bcc101d8721cfb59d0
treebc6225b429352e38c5621f0aaa77899692961c2c
parent01cbb586987e975f1dcc742cd501d06e86dcc7a7
parent01c2b053aa74d9bd461a29e0c252f7a8ce3f115a
am 01c2b053: Merge "Fix mac build"

* commit '01c2b053aa74d9bd461a29e0c252f7a8ce3f115a':
  Fix mac build