tree 5006cc488ffc7c1a63ab3c08f877a046a6f3f351
author The Android Open Source Project <initial-contribution@android.com> 1237160836 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1237160836 -0700

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