tree df5da87428ca66e2758e2ab321f682ce01a23d56
parent b2065191bd7258c75204da8ea518ee9856212a80
parent 8a1d0a446fc3d59b006cbec7fc398593e87b8330
author Colin Cross <ccross@android.com> 1457400462 +0000
committer android-build-merger <android-build-merger@google.com> 1457400462 +0000

Merge "Fix mac build" into nyc-dev
am: 8a1d0a446f

* commit '8a1d0a446fc3d59b006cbec7fc398593e87b8330':
  Fix mac build