OSDN Git Service

Merge "Fix macOS build" am: b9b7f3f061 am: 710e8f4da4
authorColin Cross <ccross@android.com>
Thu, 8 Jun 2017 16:24:37 +0000 (16:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 16:24:37 +0000 (16:24 +0000)
commit75d1f43d41a54956f072b3a34bbfd5af07ca5b24
treefe28c2f1bb4f0572b7b9f002beaa29f9c45f5430
parent5cf2580f1ef3b62e3acff38bc3e70e99d4520249
parent46e53c56f0a65aeb7223fc034e6e39e6cf2f36bc
Merge "Fix macOS build" am: b9b7f3f061 am: 710e8f4da4
am: 46e53c56f0  -s ours

Change-Id: I5055b5a82ad2e1eaf3929d2c7b6ba701cc698a5d