Merge "Don't #define snprintf in VS 2015 or higher."
authorJohann <johannkoenig@google.com>
Thu, 28 May 2015 19:38:56 +0000 (19:38 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 28 May 2015 19:38:57 +0000 (19:38 +0000)

Trivial merge