am 48ffea93: am cf69b0c7: reconcile main tree with open-source eclair

Merge commit '48ffea93dff6b952b4ad5818b748dadd2dd7c19e'

* commit '48ffea93dff6b952b4ad5818b748dadd2dd7c19e':
  android-2.1_r1 snapshot