tree 450ce35cebd24fc39f8a5b2a9676b0f93c90469a
parent 3d97a06be8d204ed5df2c5609e1990bc038d9408
parent 39f130fb905302abb9c4b7fd28029d0014582574
author The Android Open Source Project <initial-contribution@android.com> 1265407804 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265407804 -0800

am 39f130fb: reconcile main tree with open-source eclair

Merge commit '39f130fb905302abb9c4b7fd28029d0014582574'

* commit '39f130fb905302abb9c4b7fd28029d0014582574':
  android-2.1_r1 snapshot