OSDN Git Service

am 4150611d: Merge "Fix mac build."
authorIan Rogers <irogers@google.com>
Tue, 4 Nov 2014 23:59:32 +0000 (23:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Nov 2014 23:59:32 +0000 (23:59 +0000)
* commit '4150611d5229c87e49762b9edf6540995eb325e1':
  Fix mac build.


Trivial merge