tree da394a395ddb1a6cf69193314846b03fe47a397e
parent f013e1afd1e68af5e3b868c26a653bbfb39538f8
author The Android Open Source Project <initial-contribution@android.com> 1231552283 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1231552283 -0800

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