tree 51bd71957a0510d5b24d1f1e118e3b342214c8c2
parent f1792b3d125a6adefa6941d20b3f26833570ab65
parent 1adbb607d2b6a74b7871a8cecd7c5690c8c5cf6d
author The Android Open Source Project <initial-contribution@android.com> 1277146242 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1277146242 -0700

merge from froyo-plus-aosp

Change-Id: Ie231effb4d9dfd63aa98ec08b269c31ce32aa1c0