Merge "avoid redefining WIN32_LEAN_AND_MEAN"
authorJames Zern <jzern@google.com>
Wed, 23 Nov 2016 00:43:21 +0000 (00:43 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 23 Nov 2016 00:43:22 +0000 (00:43 +0000)
commitd7f1d60c51b47f6d22be919362caad09469a058b
tree8674b602041377499d250d53846147e2994717a4
parent198a046d3eaaddccc0ea74560cea6ac9d8f07f7b
parent446d1ee6249a2e5f79756eee455c4916191d6263
Merge "avoid redefining WIN32_LEAN_AND_MEAN"