tree 721b2592e7607f3079c96e287a91fb971c459e8d
parent 8326f4c9abcff5b7fe6e987169c4a4511452183f
parent 37c67d328c94fa315dbf18dc53fe0b9929e55523
author The Android Open Source Project <initial-contribution@android.com> 1265388408 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265388408 -0800

am 37c67d32: reconcile main tree with open-source eclair

Merge commit '37c67d328c94fa315dbf18dc53fe0b9929e55523' into eclair-plus-aosp

* commit '37c67d328c94fa315dbf18dc53fe0b9929e55523':
  android-2.1_r1 snapshot