tree cfe2493b5bf16b3777e680695623db7aaa0ceec0
parent 687f9962d7095e18ef994cd0e64337f02ed1a5bd
author The Android Open Source Project <initial-contribution@android.com> 1231552285 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1231552285 -0800

auto import from //branches/cupcake/...@125939