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)
* commit '35a68e69ce08e2d6c2c4696330b0cf918e167559':
  Fix mac build.


Trivial merge