Merge "Allow building multi-res encoder with --shared"
authorJohann <johannkoenig@google.com>
Tue, 16 Dec 2014 23:54:36 +0000 (15:54 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 16 Dec 2014 23:54:36 +0000 (15:54 -0800)

Trivial merge