Merge "test/reg...check,video_source.h: avoid NOMINMAX redef"
authorJames Zern <jzern@google.com>
Wed, 7 Oct 2015 18:40:02 +0000 (18:40 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 7 Oct 2015 18:40:02 +0000 (18:40 +0000)

Trivial merge