tree baad616df4dab7103fa1fa7bb919c07a7c1dcb81
parent edc3fb3b9f9250ceacaf07a83beb5dde02807f9c
author The Android Open Source Project <initial-contribution@android.com> 1229565931 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1229565931 -0800

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