tree b82da355fc287d36a1f38919931c62664f485260
parent cd383c309e9a728f12f9342f450028389b3bd3f9
parent d34d5cc5e79cbeeacf3a45caad7401d81319e604
author The Android Open Source Project <initial-contribution@android.com> 1265388359 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265388359 -0800

am d34d5cc5: reconcile main tree with open-source eclair

Merge commit 'd34d5cc5e79cbeeacf3a45caad7401d81319e604' into eclair-plus-aosp

* commit 'd34d5cc5e79cbeeacf3a45caad7401d81319e604':
  android-2.1_r1 snapshot