tree 2d2a323cabff18fb7a1108d41a40062c24300d1e
parent 932d3cfd90fcdd35d7f551320dd8451ef40e729b
parent 56b2728f588644e40195908e68985b9214fcfe8a
author The Android Open Source Project <initial-contribution@android.com> 1265408625 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408625 -0800

am 56b2728f: am e58df036: reconcile main tree with open-source eclair

Merge commit '56b2728f588644e40195908e68985b9214fcfe8a'

* commit '56b2728f588644e40195908e68985b9214fcfe8a':
  android-2.1_r1 snapshot