tree c480c13897eae01114fc193bb034245c4045e49a
parent ad7eeba2ca564f4dc9a1900d94647da30734e3fb
parent 3d7637e8f95bd7d4fcaf44d7a1663bb7290772c6
author The Android Open Source Project <initial-contribution@android.com> 1265408312 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408312 -0800

am 3d7637e8: am dbf94ec6: reconcile main tree with open-source eclair

Merge commit '3d7637e8f95bd7d4fcaf44d7a1663bb7290772c6'

* commit '3d7637e8f95bd7d4fcaf44d7a1663bb7290772c6':
  android-2.1_r1 snapshot