Merge "tools_common.h: (msvs) avoid redefining off_t"
authorJames Zern <jzern@google.com>
Thu, 3 Apr 2014 19:00:27 +0000 (12:00 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 3 Apr 2014 19:00:27 +0000 (12:00 -0700)

Trivial merge