tree fbeaaacb86eb9b610563f05c32af6870964f8d79
parent a0c5294bd396e480cbf850bde283a94042526698
author The Android Open Source Project <initial-contribution@android.com> 1229565858 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1229565858 -0800

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