Android 1.6 release 1.4
auto import from //branches/cupcake/...@137197
4 files changed