am 2387b975: am 0cb42851: reconcile main tree with open-source eclair

Merge commit '2387b97534b96ab8f07a07cf9c8e20d38962b1f1'

* commit '2387b97534b96ab8f07a07cf9c8e20d38962b1f1':
  android-2.1_r1 snapshot