ref: 1c24eb2b7b3a61893ea19e9e544c24a233f89921
parent: 08f64718905efe994a207af95b1c276c104e4113
author: Yaowu Xu <yaowu@google.com>
date: Wed Jul 20 08:14:50 EDT 2011
fixed a number of problems caused by auto merges The auto merge process pull and merge commits from public git or master branch. These automerges while worked well most time, but has created a few problems. This commit fixed several issues existed long before the latest 8x8 transform commit. Change-Id: I895ca99713231b1aec521d57db5d9839f74aacfa