am f647b760: am 9215898d: reconcile main tree with open-source eclair

Merge commit 'f647b76060c4dc2a90777edeff326a26f75a4212'

* commit 'f647b76060c4dc2a90777edeff326a26f75a4212':
  android-2.1_r1 snapshot