tree 8c753faa0ee055521e5f290478a0d292bff34d94
parent 0c6ed42731be67bf7d49c68c4b5e6a762dd93096
author The Android Open Source Project <initial-contribution@android.com> 1272312482 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1272312482 -0700

Manual import as of 34082

Change-Id: Ica5cedda53436d00bdd342fe2509edd77844fb82