OSDN Git Service

am 4abb81b8: am 01c2b053: Merge "Fix mac build"
authorMathieu Chartier <mathieuc@google.com>
Tue, 14 Jul 2015 22:53:31 +0000 (22:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 22:53:31 +0000 (22:53 +0000)
commit106fd431ba2794f477e005dfd27e329c8ac6268d
tree0a0bdf1aa602f7780622aa8383e54c05b185a8d1
parentc920aaa7989dac6c2c03ba9b5e5f987e9c7192c6
parent4abb81b894d97e9924aa47bcc101d8721cfb59d0
am 4abb81b8: am 01c2b053: Merge "Fix mac build"

* commit '4abb81b894d97e9924aa47bcc101d8721cfb59d0':
  Fix mac build