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

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