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