OSDN Git Service

Merge "Fix mac build."
authorNicolas Geoffray <ngeoffray@google.com>
Tue, 20 Oct 2015 11:59:35 +0000 (11:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 11:59:35 +0000 (11:59 +0000)
am: 4206af2185

* commit '4206af2185bd1d3d0356a8fbc7c5e151fdd261d5':
  Fix mac build.


Trivial merge