tree fe15665df393e7d3ccacbbf49e961c4869e8f7fd
parent 5f44349c1239fdce883ae0d79e9990455a16e04a
author Evan Millar <> 1237944803 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1237944803 -0700

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