tree c797e6841c0bd92bc0fda3b5f9a9830aac6abc1d
parent 237eaa1e96a36e66209957345714d76565442355
author Jeffrey Sharkey <> 1237945949 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1237945949 -0700

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