tree e2bb774910b224e285c578e5a85cb363a6df9500
parent 91f45860313af085acc139269b4d6c9d5b35f294
author The Android Open Source Project <initial-contribution@android.com> 1234309444 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1234309444 -0800

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