Merge "Include type defines"
authorJohann <johannkoenig@google.com>
Fri, 20 Jun 2014 18:29:19 +0000 (11:29 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 20 Jun 2014 18:29:19 +0000 (11:29 -0700)

Trivial merge