tree c0f0be149413cc44831a426a6bdd5fe2379cbcc5
parent 9f6e1d367d772894733387e6dae2ddf685c5bf03
parent 590caeedbd07ae84da361e223a98ddfd56cc1385
author The Android Open Source Project <initial-contribution@android.com> 1265407971 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265407971 -0800

am adbe0586: am 217f8ef4: reconcile main tree with open-source eclair

Merge commit 'adbe0586957a71d2aa9f100646882dbca1c78f12'

* commit 'adbe0586957a71d2aa9f100646882dbca1c78f12':
  android-2.1_r1 snapshot