OSDN Git Service

Merge "Fix Mac build."
authorElliott Hughes <enh@google.com>
Tue, 11 Oct 2016 04:00:31 +0000 (04:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Oct 2016 04:00:31 +0000 (04:00 +0000)
commitcbe7d6891645f276c39f4b78aa7299831e59debd
tree4381a4b919193d2b5e207b8dd3ccfbe2c86e9419
parent676196c1e2a421d3a6b34f77e9d092eadafb9597
parente89385743e30fdbcb7ccf87caff71b354872922b
Merge "Fix Mac build."
am: e89385743e

Change-Id: Ie5feeb3e2834b8dd2bba868fbf66dbb98b6d23de