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

Merge commit '9215898d31a481aa04ac491b17438f366a6e8f52' into eclair-plus-aosp

* commit '9215898d31a481aa04ac491b17438f366a6e8f52':
  android-2.1_r1 snapshot