tree 09ec85be7c999459d89f9add38c63e41c2344dd4
parent 34d6eabc451f16d5f168fc1595ee604f21bccc51
author Dianne Hackborn <> 1237945003 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1237945003 -0700

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