Merge "Change the strategy for deciding the display size"
authorAdrian Grange <agrange@google.com>
Tue, 14 Jan 2014 15:52:37 +0000 (07:52 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 14 Jan 2014 15:52:37 +0000 (07:52 -0800)
1  2 
vpxdec.c

diff --cc vpxdec.c
Simple merge