am 67bebd06: am 0749a3f1: reconcile main tree with open-source eclair

Merge commit '67bebd06dfa7b4f94520ea2623f1d76e2a28a186'

* commit '67bebd06dfa7b4f94520ea2623f1d76e2a28a186':
  android-2.1_r1 snapshot