ref: dc90541563331da238e9a9d82c7ec42af2a9f4be
parent: 3b9befe52e06437b370ac381bd077d45f8e71daa
parent: 49cbe4580d4f02cd55a72c6442f33a249321e605
author: Yaowu Xu <yaowu@google.com>
date: Fri Nov 15 10:20:23 EST 2013
Merge "Renamed two files"