tree b24843b5d789150eb1d468cd8e47cfba50b7978f
parent 185d17974729a98cf48a71ab9f16adaab9d1e1e0
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