23cda69aaa
Original author: jackpal Merged from: //branches/cupcake/... Automated import of CL 145523
Original author: jackpal Merged from: //branches/cupcake/... Automated import of CL 145523