tree faaf82d874052bec80908cd093b8efd06786d1d6
author The Android Open Source Project <initial-contribution@android.com> 1236727255 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1236727255 -0700

auto import from //branches/cupcake/...@137197