Merge "vp8_multi_resolution_encoder.c is not a generated example"
authorYunqing Wang <yunqingwang@google.com>
Fri, 4 May 2012 15:22:45 +0000 (08:22 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 4 May 2012 15:22:45 +0000 (08:22 -0700)
commitf86993f195ec0a82464fe25922e3857bc68b2ee5
tree8bbc37a6c66f77113ba0222bf9274ea97054ab01
parent357800e7cd5b6b71a2960c4f685e2c2bfff10212
parentef8ba4f6680e89698b13d339916960af670779cf
Merge "vp8_multi_resolution_encoder.c is not a generated example"