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

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