tree b4b790ceb61acf362f077cd581447ad900359af8
parent 86abe4b9898668901b812fa6c1eaa38cb34989e2
author The Android Open Source Project <initial-contribution@android.com> 1236624731 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1236624731 -0700

auto import from //branches/cupcake/...@137197