OSDN Git Service

Merge "Fix mac build"
authorColin Cross <ccross@android.com>
Sat, 22 Oct 2016 07:59:41 +0000 (07:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Oct 2016 07:59:41 +0000 (07:59 +0000)
am: 058a64acf5

Change-Id: Ia689c74ddf1eddb303194b7816f4bfd0956425ca


Trivial merge