OSDN Git Service

Merge "Fix mac builds" am: 6fe468835c
authorColin Cross <ccross@android.com>
Fri, 26 Aug 2016 02:49:45 +0000 (02:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 02:49:45 +0000 (02:49 +0000)
am: 203dc006be

Change-Id: I17e876a20aadee6ae743ed1b59a2c9270928ebd4


Trivial merge