OSDN Git Service

Merge "Fix Mac build." am: e89385743e
authorElliott Hughes <enh@google.com>
Tue, 11 Oct 2016 04:06:03 +0000 (04:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Oct 2016 04:06:03 +0000 (04:06 +0000)
am: cbe7d68916

Change-Id: I689671c08773b0d9e7f5a3bb1990d72d17e28ecc


Trivial merge