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)
commit2dd4813d26665abc34217e78008e0572b4cb6c59
tree8e148cb56b1d31bd7285bd4641a6c751095980b0
parentd06e598190aeeef3e8ca8a6d9e7d97aab01efbc0
parent7f0ec9ac316a06b6c0b0a3966973affc92fcaafd
am 7f0ec9ac: am bfe9d08e: Merge "Fix mac build."

* commit '7f0ec9ac316a06b6c0b0a3966973affc92fcaafd':
  Fix mac build.