tree b1940c5f033ed81b538db1762b8467667a0a0136
parent 1152aff9d0767e528aa4a40cc8acb51b9c21d2e7
author The Android Open Source Project <initial-contribution@android.com> 1232489041 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1232489041 -0800

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