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

Merge commit '9e8cd529c75374d55eae51af564dc28c82c81f2b' into eclair-plus-aosp

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