tree fb6c421cd04ffed74e50cd62e4fdab34d5a9f448
parent 0eaec58e292ce4eaa6baadecf643f0f65e48d278
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