tree 41d8251d3e6a509aacc79f160fc5c1a376fac6a8
parent 9c4991f1ec2ddc477dc71b4ff915302b47498ecd
parent cc303b81e4906d57cbe81c13dc446ad71bce7639
author The Android Open Source Project <initial-contribution@android.com> 1275954307 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275954307 -0700

am cc303b81: merge from froyo-plus-aosp