tree 60e3889c7cb316024252ce7b8a10f98014773abd
parent a67baff9a50be3a335e650d208d51e33e20b70e2
parent 5cbd5d9ff446f9d677ad4eabbdc019942cc84b6a
author The Android Open Source Project <initial-contribution@android.com> 1276539660 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1276539660 -0700

merge from froyo-plus-aosp

Change-Id: Ie8f2b137de580bfb23a1bdee513a8a20075e40a3