auto import from //branches/cupcake/...@130745
The Android Open Source Project authored
9f65adf2