tree e65580f0caa45af93f0ffd8e00884a1aa6031b3a
parent 4f68be1a5b53f690f1a7d8ba62cddb5ef0022a96
author The Android Open Source Project <initial-contribution@android.com> 1237529334 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1237529334 -0700

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