tree d1ed91bcdc886eeb1ae7d56218ed7001dd1da534
parent f18b9082e81fa9b892f7ded4f772da0d0557f63a
author Dianne Hackborn <> 1237944618 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1237944618 -0700

Automated import from //branches/cupcake/...@141843,141843