32346a89c3
Original author: davidsparks Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146671