auto import from //branches/cupcake/...@127436
The Android Open Source Project authored
d9effa54