OSDN Git Service

am 35a68e69: Merge "Fix mac build."
authorChristopher Ferris <cferris@google.com>
Tue, 15 Sep 2015 23:47:24 +0000 (23:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Sep 2015 23:47:24 +0000 (23:47 +0000)
commitc43a3c59c45cef7711d073f022cae6400a0043a9
tree522a8af6a09f6b4e443b5ca2d226fe738e4ab424
parente82b95bbc0351fcad0a03d54b4467c6844114a23
parent35a68e69ce08e2d6c2c4696330b0cf918e167559
am 35a68e69: Merge "Fix mac build."

* commit '35a68e69ce08e2d6c2c4696330b0cf918e167559':
  Fix mac build.