Merge "Correct the mode decisions in special cases"
authorYunqing Wang <yunqingwang@google.com>
Fri, 5 Sep 2014 20:45:41 +0000 (13:45 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 5 Sep 2014 20:45:41 +0000 (13:45 -0700)

Trivial merge