tree e7b15dddb89338d148474c4e4c16acb087e322c7
parent 7984f7ab3e13cda0c3b04ffeb2608f232e57f93a
author The Android Open Source Project <initial-contribution@android.com> 1234309439 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1234309439 -0800

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