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)
commit1fc2b0fd00d4ba17bec8c89aa6eab503d77a3eed
tree532c9a95b64d11469ca11e2f27b0703d5094aba1
parentd658216276431733c94d7b0c16a38b12e58dba0d
parentbaef0b89da64643eeadbca3e2cb824419588cd71
Merge "Include type defines"