tree d36fc2dacb678829a946277335a1e18b878ce2ee
parent 09a7e0c4878283f8aff26f33ca89f85e36048bdb
author The Android Open Source Project <initial-contribution@android.com> 1236974660 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1236974660 -0700

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