ref: dc079ab1387bca763d6c6a6ae575c0764453a65b
parent: 54e702b5d77a3fda1d74f727909962fd6924a4e7
parent: 57b97b56f636f32b3bd20b4595ab368de8d859cf
author: Yunqing Wang <yunqingwang@google.com>
date: Fri Oct 11 05:38:24 EDT 2013
Merge "Code cleanup"