OSDN Git Service

Merge "Fix mac build"
authorMathieu Chartier <mathieuc@google.com>
Tue, 10 Nov 2015 02:54:25 +0000 (02:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Nov 2015 02:54:25 +0000 (02:54 +0000)
am: a5c3e44663

* commit 'a5c3e44663c3b9c97fe350b4191cec079738fca3':
  Fix mac build


Trivial merge