tree eb76d5cfe8073b07c71838ab85dcd381a7a8cfea
parent be67c30dd6aaa833e130e723f5810ee7789694ea
author Andy McFadden <> 1237952512 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1237952512 -0700

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