Android 1.6 SDK release 2
auto import from //depot/cupcake/@135843
80 files changed