Merge pull request #14553 from briansull/fix-warn
authorBrian Sullivan <briansul@microsoft.com>
Tue, 17 Oct 2017 23:34:37 +0000 (16:34 -0700)
committerGitHub <noreply@github.com>
Tue, 17 Oct 2017 23:34:37 +0000 (16:34 -0700)
Fix for x86 desktop build break


Trivial merge