tree cfbac5189d983a7c7d05539fc972a86738d4ebe1
parent 4966b56f4baab759050da7222e1645b394c16e90
parent f647b76060c4dc2a90777edeff326a26f75a4212
author The Android Open Source Project <initial-contribution@android.com> 1265408451 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408451 -0800

am f647b760: am 9215898d: reconcile main tree with open-source eclair

Merge commit 'f647b76060c4dc2a90777edeff326a26f75a4212'

* commit 'f647b76060c4dc2a90777edeff326a26f75a4212':
  android-2.1_r1 snapshot