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

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