tree aa7a28745b25f50e17aa4578a720772726871d0a
parent 7e343b8d39309d2c9d73cc5d1ec2434e666ae48b
parent 766d1b7458e5dae1cca36b01cf13e4d16536a091
author The Android Open Source Project <initial-contribution@android.com> 1277490097 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1277490097 -0700

merge from froyo-plus-aosp

Change-Id: I9bd45d66c9586b99635d7d05d1f351126bfc9840