OSDN Git Service

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

Change-Id: I0eff3622be35305ef852e949c813b47d1e5c4ecf


Trivial merge