Merge "Merge mr_pick_inter_mode and pick_inter_mode"
authorYunqing Wang <yunqingwang@google.com>
Mon, 19 Dec 2011 16:42:20 +0000 (08:42 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 19 Dec 2011 16:42:20 +0000 (08:42 -0800)

Trivial merge