am c944e589: am fbe53add: reconcile main tree with open-source eclair

Merge commit 'c944e58943ea6e07ac558c3e9da7567a87eaf660'

* commit 'c944e58943ea6e07ac558c3e9da7567a87eaf660':
  android-2.1_r1 snapshot