OSDN Git Service

am bfe9d08e: Merge "Fix mac build."
authorChristopher Ferris <cferris@google.com>
Sat, 12 Jul 2014 01:42:16 +0000 (01:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 12 Jul 2014 01:42:16 +0000 (01:42 +0000)
* commit 'bfe9d08e93f6b866e7ecc63f32083e3fc868e606':
  Fix mac build.


Trivial merge