tree 2b231ced937936b97fd985339e76db1fff43bff5
parent cfb3b2780016b4e9ab4849e22d9c3acbaf535248
author Dianne Hackborn <> 1237945002 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1237945002 -0700

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