tree 650b23b79f799a1693b64ea1b9e5bb062ecaf8b6
parent 989fade304ef5253b5b401f347e26f768d75f35f
parent 3a0576a41881ceb11c3b11642666abc2f3d5a271
author The Android Open Source Project <initial-contribution@android.com> 1280342124 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280342124 -0700

am 3a0576a4: merge from open-source froyo

Merge commit '3a0576a41881ceb11c3b11642666abc2f3d5a271' into gingerbread

* commit '3a0576a41881ceb11c3b11642666abc2f3d5a271':