tree 0488269c51b6d6bfb8a8b5587283933525a64652
parent ba7d40a700ac90f339011e1465fabe13e57b9d4a
author Dianne Hackborn <> 1237945002 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1237945002 -0700

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