tree 80ee017b6a291485dfc199bbcb3574890f8b3d78
parent 43b6f87a3381ed51b3529d22eeff8c58cc23f3f2
parent 10ebdb2ed235c5fc70d72ba11c7e7d2caf4b3296
author Ying Wang <wangying@google.com> 1433610318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433610318 +0000

am 10ebdb2e: Fix Mac build.

* commit '10ebdb2ed235c5fc70d72ba11c7e7d2caf4b3296':
  Fix Mac build.