Merge "vpx_mem: remove memory manager code"
authorJohann <johannkoenig@google.com>
Wed, 22 Apr 2015 20:09:39 +0000 (13:09 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 22 Apr 2015 20:09:39 +0000 (13:09 -0700)

Trivial merge