am e58df036: reconcile main tree with open-source eclair

Merge commit 'e58df036341d4926db42c06b9f8cf6504a3a95fe' into eclair-plus-aosp

* commit 'e58df036341d4926db42c06b9f8cf6504a3a95fe':
  android-2.1_r1 snapshot