tree faaf82d874052bec80908cd093b8efd06786d1d6
parent 08a3e2f3037623a0db0b6a3578832080bbd62b3e
author The Android Open Source Project <initial-contribution@android.com> 1236976103 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1236976103 -0700

auto import from //branches/cupcake_rel/...@138607