1c8fd9eaf6
Original author: romainguy Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 145490