d73a32e726
Original author: ramanan Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146539