tree f02ba1bc29f4fe6853d9b7008eed37cdcfb96e81
parent 42309f82c906c3bf660f52bf6cb1242bbabdc32d
parent 198fe95bdbe59b9d2048c9ccb015132bfed578b2
author The Android Open Source Project <initial-contribution@android.com> 1265388453 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265388453 -0800

am 198fe95b: reconcile main tree with open-source eclair

Merge commit '198fe95bdbe59b9d2048c9ccb015132bfed578b2' into eclair-plus-aosp

* commit '198fe95bdbe59b9d2048c9ccb015132bfed578b2':
  android-2.1_r1 snapshot