OSDN Git Service

Merge "Fix mac build" am: c520f85302
authorColin Cross <ccross@android.com>
Mon, 19 Sep 2016 20:03:38 +0000 (20:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Sep 2016 20:03:38 +0000 (20:03 +0000)
am: fa6a372b21

Change-Id: I9ac106f68bbe752c6f7eca658a2c799169836e0f


Trivial merge