Merge pull request #3495 from parnic/fix-reflection-vs2012-warnings
authorWouter van Oortmerssen <wvo@google.com>
Wed, 6 Jan 2016 20:03:40 +0000 (12:03 -0800)
committerWouter van Oortmerssen <wvo@google.com>
Wed, 6 Jan 2016 20:03:40 +0000 (12:03 -0800)
Fixed warning building in VS2012


Trivial merge