tree edd2d7f2728e8dbef1427123204c8859d24436e2
parent 1fc1b4b05c31b222b31edd425af99bec1933c7d4
author Dianne Hackborn <> 1237942055 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1237942055 -0700

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