tree 6b1e874289fe400038ed1faf77631325ac56b1a2
parent 67763a5f3f7f1c82974bcc5d46e0595980c565c6
author The Android Open Source Project <initial-contribution@android.com> 1269985742 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1269985742 -0700

Manual import as of 26040

Change-Id: Iccdd60e06081ca97e31d685c5ae5e4d418dcaca4