tree 3e83f09ce0ff4b3ede86291972a6bd44a13a7915
parent 47f9ba02ae663316808f2e64314a332dc637b73a
parent 242393fec13d6703e1d2ef27873fc222cb1d3db3
author Dan Willemsen <dwillemsen@google.com> 1456530128 +0000
committer android-build-merger <android-build-merger@google.com> 1456530128 +0000

Merge "Fix windows 64-bit builds" into nyc-dev
am: 242393fec1  -s ours

* commit '242393fec13d6703e1d2ef27873fc222cb1d3db3':
  Fix windows 64-bit builds