810ec50a1e
Original author: yslau Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146179