ref: d7f1d60c51b47f6d22be919362caad09469a058b
parent: 198a046d3eaaddccc0ea74560cea6ac9d8f07f7b
parent: 446d1ee6249a2e5f79756eee455c4916191d6263
author: James Zern <jzern@google.com>
date: Tue Nov 22 19:43:21 EST 2016
Merge "avoid redefining WIN32_LEAN_AND_MEAN"