am 97233468: reconcile main tree with open-source eclair

Merge commit '97233468' into eclair-plus-aosp

* commit '97233468': (198 commits)
  android-2.1_r1 snapshot
  ERD79
  ERD78
  ERD77D
  ERD77C
  ERD77B
  ERD77
  ERD76
  ERD75
  ERD72
  ERD71F
  ERD71E
  ERD71D
  ERD71C
  ERD71B
  ERD71
  ERD70B
  ERD70
  ERD69
  ERD68B
  ...