b0c6dbd53b
Original author: jham Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 147255