tree 3f082ea2a5f2c750c696c6e3e8c80d287257820b
parent 4e8e998ecc2bf8b3971d62963c09b558ca6d5da4
parent 609fef7173a1278cb79d7aefdd22a22547648cab
author The Android Open Source Project <initial-contribution@android.com> 1280342844 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280342844 -0700

am 609fef71: am 3a0576a4: merge from open-source froyo

Merge commit '609fef7173a1278cb79d7aefdd22a22547648cab' into gingerbread-plus-aosp

* commit '609fef7173a1278cb79d7aefdd22a22547648cab':