
Original author: brettchabot Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146177
Original author: brettchabot Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146177