OSDN Git Service

Merge "New attempt at fixing mac build."
authorNicolas Geoffray <ngeoffray@google.com>
Tue, 20 Oct 2015 12:40:16 +0000 (12:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 12:40:16 +0000 (12:40 +0000)
am: 620021e643

* commit '620021e643518dc93dc618d3e9df1c33ff8a491c':
  New attempt at fixing mac build.


Trivial merge