Merge "vpx_mem: remove REPLACE_BUILTIN_FUNCTIONS"
authorJames Zern <jzern@google.com>
Wed, 29 Apr 2015 02:58:38 +0000 (02:58 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 29 Apr 2015 02:58:39 +0000 (02:58 +0000)

Trivial merge