am 96ccdc22: reconcile main tree with open-source eclair

Merge commit '96ccdc223b71f9e356d10ed3199007567996e062'

* commit '96ccdc223b71f9e356d10ed3199007567996e062':
  android-2.1_r1 snapshot
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.