tree b4293a1636331777f640f43f814667a9e1b0bbb7
parent dab68864983c4a0c6ef9e6d7e5834472c4c75f9c
author The Android Open Source Project <initial-contribution@android.com> 1229565888 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1229565888 -0800

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