OSDN Git Service

am 7f0ec9ac: am bfe9d08e: Merge "Fix mac build."
authorChristopher Ferris <cferris@google.com>
Sat, 12 Jul 2014 02:06:18 +0000 (02:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 12 Jul 2014 02:06:18 +0000 (02:06 +0000)
* commit '7f0ec9ac316a06b6c0b0a3966973affc92fcaafd':
  Fix mac build.


Trivial merge