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