tree f46d6b23eaeeaf5a28396d258ee29eb4c1580749
author The Android Open Source Project <initial-contribution@android.com> 1229565864 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1229565864 -0800

Code drop from //branches/cupcake/...@124589