OSDN Git Service

Merge "Fix mac build"
authorColin Cross <ccross@android.com>
Fri, 16 Sep 2016 01:04:19 +0000 (01:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Sep 2016 01:04:19 +0000 (01:04 +0000)
am: 175a9be49d

Change-Id: I57ec257f1b84fffc9e201953981e2ac4a12e4fd0


Trivial merge