tree 821e85f815701645ade333b7ca04e3477c6fd6eb
parent c88d03b5156108c92abc3d527d600b7c393fd7c7
parent 520d66ec4145f22ecfd34581ddd52578bd39a964
author The Android Open Source Project <initial-contribution@android.com> 1265408143 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408143 -0800

am 520d66ec: reconcile main tree with open-source eclair

Merge commit '520d66ec4145f22ecfd34581ddd52578bd39a964'

* commit '520d66ec4145f22ecfd34581ddd52578bd39a964':
  android-2.1_r1 snapshot