am 37c67d32: reconcile main tree with open-source eclair Merge commit '37c67d328c94fa315dbf18dc53fe0b9929e55523' into eclair-plus-aosp * commit '37c67d328c94fa315dbf18dc53fe0b9929e55523': android-2.1_r1 snapshot