am 9c3119ad: reconcile main tree with open-source eclair

Merge commit '9c3119adb14168017aa579d69fbc4b40e451f162'

* commit '9c3119adb14168017aa579d69fbc4b40e451f162':
  android-2.1_r1 snapshot