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

Automated import from //branches/master/...@141845,141845