fde4a9e136
Original author: guangzhu Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146551