tree bb2817e6d21b485718324888c1cb45f1bf6bb75d
parent 678764730bb7034537e04dbfe5b2191d775e1f73
author Dianne Hackborn <> 1237945103 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1237945103 -0700

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