tree a3df41414cc358f459b12cab90ae7a35dee7b618
parent 1ff70f7f72aa14ff565278337b668a76cc91fb2a
author The Android Open Source Project <initial-contribution@android.com> 1236624734 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1236624734 -0700

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