ref: ebac8f3487592896040cfbd6c443bda1b37fd077
parent: 54bec0971f0d6ee028579137bfe68ebd37e19d77
parent: 1dd9a63929495a0f1d39848f33a970a159bf03de
author: Yunqing Wang <yunqingwang@google.com>
date: Fri Sep 5 09:45:41 EDT 2014
Merge "Correct the mode decisions in special cases"