tree ec412b6a7c8a5befe94441a403c6266ac9ef282e
parent 20d93db18de9001dcb5af46e4d1d2bac10aa2eca
parent 97233468715838e42b98abe047c60e108fcc44bd
author The Android Open Source Project <initial-contribution@android.com> 1265388221 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265388221 -0800

am 97233468: reconcile main tree with open-source eclair

Merge commit '97233468715838e42b98abe047c60e108fcc44bd' into eclair-plus-aosp

* commit '97233468715838e42b98abe047c60e108fcc44bd': (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
  ...