am 56b2728f: am e58df036: reconcile main tree with open-source eclair

Merge commit '56b2728f588644e40195908e68985b9214fcfe8a'

* commit '56b2728f588644e40195908e68985b9214fcfe8a':
  android-2.1_r1 snapshot