Merge "Include vpx_config.h in vpx_timer.h"
authorJohann <johannkoenig@google.com>
Wed, 20 Aug 2014 21:47:29 +0000 (14:47 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 20 Aug 2014 21:47:29 +0000 (14:47 -0700)

Trivial merge