tree bfa96297c22d7442d7a8fe9f7a3c3bef9e35f398
parent b5652cab7601d32d26c9514925ac4941de88dc42
author Dianne Hackborn <> 1237945003 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1237945003 -0700

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