a34df8a2ba
Original author: ctate Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144405