am 279fadf9: reconcile main tree with open-source eclair

Merge commit '279fadf93958d420c67f791291a7c761977aff57'

* commit '279fadf93958d420c67f791291a7c761977aff57':
  android-2.1_r1 snapshot